More fixes for server/client code.