Fix same bugs