For me the ordinary income also ended up included in line 1, not line 7a. I don't think TurboTax will do it any other way. I went ahead and submitted my taxes with it this way.
