Small corrections

Other small fixes
Merge pull request #472 from gimmy/patch-3

Small corrections