Changes to get build working again on linux.