fix spanner regressions