Minor fixes

Some cosmetic fixes in response to the comments made by Vincent Rabaud
in the pull request discussion.