Fixes misc

Basically everything that did not fit in any other branch (and did not deserve its own)