Issue #154: minor corrections