More bug fixes to master server.