fwk-new-comp: fixups