Further tweaking for ORION-397 and ORION-398