Clean some reported bugs