Heads up to any other sole proprietors trying to use form 3468 to take solar tax credit

I am a sole proprietor with a rental property.  I installed solar panels in 2023 and was instructed to claim the federal 30% credit using form 3468.  Two issues have come up:  First, TurboTax (Home and Business version) insists I put an IRS pre-registration number on line 2a, even though in fact I am not even eligible to apply for one since I don't have (or need) an EIN.  Anyone come up with a workaround for this?  (I saw a discussion thread about it among intuit tax professionals but no solution put forth.)  Second, there seems to be a problem with TurboTax transferring the number from line 32 of form 3468 to Part III line 4a of form 3800--the number entered by TurboTax on form 3800 is double the number calculated and recorded on form 3468.  My suspicion is that TurboTax is creating an extra identical copy of form 3468 and adding that to the original one.  The reason I think this is that when I run the error check, it flags TWO errors on form 3468 about that first issue I mentioned, leaving line 2a blank.  If I "fix" the error by entering a dummy number in line 2a, both error flags go away.   I've been in touch with TurboTax customer service and they are "investigating" the issue about the incorrect credit on form 3800 issue and don't know when they will have an answer.  They had no suggestion at all about the issue of requiring an IRS pre-authorization number on line 2a. I'm curious if anyone else has run into either of these issues and if you have found a solution.