Issue #273: Minor fixes