Fixes to addEventListener references