More fixes related to issue #1