Squashing bugs

https://map.bnnd.eu.org/user/maxolasersquad/diary/14774