fix more eclass stuff