Fix various issues with listener methods using 2 parameters