Try to get things building on Mac and Linux again