Linux build fixes, still more to come