Fix last icc warning and errors