Miscellaneous style fixes