Retirement tax questions

It is confusing. I am back for another question. Based on your answers and other threads, should I then depend on how Fidelity treats the situation and completes the 1099-R form? If Fidelity says the excess return is a timely correction, then I shouldn't volunteer to pay penalties for 2022 and 2023. Do you agree? Any other suggestions based on your experience?