Misc other formatting fixes