Small tweaks to get linux build working