Some landscape.io fixes
Merge pull request #1027 from hugovk/landscape_fixes

Some landscape.io fixes