Bug fix: Fix handling of breaks and admin events