Misc fixes from various people over the last few months.