Fixing a couple of errors on listners linkage