Fixes issues brought up by landscape.io