Small listener usage changes