Minor house style fixes