Various landscape.io highlighted fixes