Various minor style fixes