Small fixes
Merge pull request #5 from bmneely/small-fixes

Small fixes