fixes to server fixes