Correct build issues