Server config fixes