Minor changes to the listeners.