ISHAcore/legend fixes.