more local changes to get build working