Addresses some of the build errors, but the ITs are still failing