Merge "Fix two issues I found when adding CTS" into main