Final fixes from PR 406 suggestions