A few bugfixes found with landscape.io
Merge pull request #206 from Gallopsled/landscape-bugfixes

A few bugfixes found with landscape.io