More small style fixes