More fixes for server