More fixes to Issue #148