Minor fixes for code review #66