Fixes broken scenarios committed as WIP