Bug fixes to multiple places in both server code and client code.