Incremental fixes towards Issue #22