Minor fixes for changes introduced in #99257 that could not be fixed in time as the PR needed to be expedited.