Fix issues in listeners