Fix a couple of bugs landscape.io found.
Merge pull request #37 from garnaat/fix-landscape-errors

Fix a couple of bugs landscape.io found.