A few minor fixes
Merge pull request #4 from crwper/merge_into_flyblind

A few minor fixes to the previous pull request