follow up: cjs evaluation fixes