I ended up figuring it out. Here’s the what worked in my case. PS. I had to rebuild code files to get some of the errors to go away.