fixes from PR notes