Bunch of tweaks that came up while working on other stuff.