Fixing up some minor issues [#68977604]
Making this diff as small as possible to make it easier to carry through