Fix lint warnings on Collection