More fixes from PR