Issue #51: minor updates