Event handling fixes