Big fixes for Event Import