Event control improvements