Misc. minor cleanups