Listening fixes