Issue #235: More fixes