server/client fixes