Server changes to support upcoming overhaul of setup.c