Fixed same bugs.