fix more diffs