If the diagnostic talks about additions, we monkey with those - like the add back for 50% meals or bonus depreciation.  If it talks about subtractions, we monkey with those - like p/y bonus.  We do have a few returns that we can't kill the diagnostic no matter how much we play with it.  I've been hoping an update will resolve the issue but we may end up disabling the diagnostic in problem files.   

I opened a ticket with support per IntuitGabiU (post # 2 above) but they closed it without a resolution.