icm_basics fixes