Fixed same bugs