Server and client fixes after testing.