Some subtle style fixes