Convention fixes. Issue #192