A few small style fixes