Minor tweaks

Bugfixes for bugs I haven’t noticed yet :)