misc fixes
Merge pull request #1528 from devoncarew/devoncarew_misc_fixes

misc fixes