More improvements in user event handling