fixing latest breakages
Merge pull request #259 from patriot1burke/master

fix latest breakages