Fix collection scanner regressions