Cleaned up server startup problem