Clean some reported bugs 2