More fixes related to issue #4