fixes requested in PR review