Misc. minor clean-up