Fix regressions in the form of CA2101