Fix remaining Triggering CTT cases