Event handling fixes
Event handling fixes