Fix small errors from #10978

This patchset fixes small glitches which caused #10978.