Clean some reported bugs
Clean some bugs 2
Clean some bug