Cross outcome logic fixes