Retirement tax questions

Have you tried manually entering them instead of importing them?    When you say NO to the RMD follow-up, you will be asked what you did with the money.   If you tell TurboTax that you put the money back on that screen, it will remove those amounts for taxable income.   If you returned all of the money from both distributions, you should not be asked the covid questions since you should not have any 2020 distribution amounts - they were all rolled over.