Fixes related to pull request #154