fix more broken elements