fixes #754
fixes for issues found during testing