Fix node and link listeners