Updates to get build working