Server fixes

fixes to server