clean up more warnings on icc