Removed warnings on listeners