follow-up r86169 - 2 minor issues found while writing unit tests