Issue #107: Minor fixes