Fix some broken scenarios