Merge pull request #807 from SamWhited/development

Misc minor bug fixes