Little fixes for listener