more fixes for the Cmp optimization