Fixup cgr-engine