Fixes for pull request 316