Squashing bugs

https://www.openstreetmap.org/user/maxolasersquad/diary/14774