Minor fixes to the MyListener