Fixed event import issues