Initial fixes for Issue #289