I found out the problem. As I had assumed ownership of the IRA it is NOT considered an inherited IRA. The RMD was made to me, not my spouse. So I did not say yes to the question about an inherited IRA. When I answered the questions for the 8606 I combined the two cost basis from last year. Now everything is correct.
