multiple server-client fixes