Fix regressions due to an in progress work