Fixes for server startup after migrating for git.