More fixes to failing old scenarios.