Event extractor bugs fixed.