more fixes to icv