Corrected build errors