A few bugfixes found with landscape.io