Various fixes

Too sleepy to write much about these. You were sitting next to me and probably remember what we did.