More error fixes for server