fixes from PR