Corrects build issues