small event handling tweaks