Fix even moar outstanding issues
Merge pull request #3 from wvu-r7/pr/2848

Fix even moar outstanding issues