Continue improving robustness of Linux / icc build