Various small non-user-facing tweaks