few changes to icp.*