More fixes to broken scenarios.