fixes from 3P reviewers