fixup: cmp fixes