Added some missing listener calls.