Fix issue #909
Fix issue #912
Merge pull request #914 from Sophist-UK/fix_various_minor_issues

Fix various minor issues