few fixes from server