Misc style fixes