Corrected build errors with changes.