More tweaks

https://map.bnnd.eu.org/user/MacDude72/diary/5153