Fixe some bugs