Solve CF downgrade problems