Fixes for  ad-hoc testing finds
Merge pull request #75 from mdsol/feature/lint_ad_hoc_fixes

Fixes for  ad-hoc testing finds