CORE-6091 Corrected build errors