Minor changes in cmp.