Changes to get build working for us