Minor changes towards solving the problems indicated by AJ in #82023