Fixed minor errors in server/client