Miscellaneous fixes based on landscape.io