Small fixes
Merge pull request #73 from rodms10/small-fixes

Small fixes