Changes needed on Linux with ICC