Fix broken listeners and some jshint