fixes from server