Reconciled build issues