Stuff

fixes #2217
fixes #2204

There was another one I wanted to fix but people gave up in despair so I'm not touching that anymore