fix a couple things that cropped up during merging
Merge pull request #264 from jspiewak/merge-cleanup

fix a couple things that cropped up during merging