fix regressions after sync