Issue #220: Minor fixes