Fix various problems

This MR is a collection of some fixes for things I came across during my work for !30 (merged) which I'll have ready soon.

See the individual commit messages for what's being changed.