Server and client fixes