Fix regressions.
Selection tests green (first iteration).