Issue #173: fixed minor problems