Fixed the issues with server startup