Fixup some missing/redundant scenarios