A few style fixes