Some minor fixed