Misc cleanup that I pulled out of other unrelated branches