Fixes related to issue #80