Issue #353: Minor fixes