Some small fixes
Merge pull request #1 from bmneely/some-small-fixes

Some small fixes