F6->F7 upgrade dependency errors