Fixes for pull request 66