Thanks -- deleting the forms as described in another post didn't change any of the numbers for me. I had to override the fields described here and then my return was accepted!
