Merge pull request #8089 from acozzette/fixes

Fixed some minor issues