Try to get build working with Mac too