fix more imports EIBTI-style