Issue #180: Minor fixes