Corrected build issues.