More fixes for Issue #10