Merge "Fix build on some linux machines"