Fix stuff found in merge process, closes #1215
Merge pull request #1231 from bcrowe/3.0-post-merge

3.0 - Fix stuff found in merge process, closes #1215