some minor fixed