More fixes for Issue #495