fixes to client server interaction