Clean some bugs
Clean some bugs 2