iccp3m fixes?