More events-related fixes.