Made icc related fixes