Fixed two remaining issues with continuous events.