Tweak event handling