Several minor style fixes