Misc late minor fixes