More fixes to get building on linux