Fixes for the issues we've seen in CI run for file-refactor branch.