Issue #57: Minor changes