Some minor fixes

Just a few trivial quick fixes to get rid of a few more bugs. Should be mergable at any point, might add more commits if not yet merged.