Lint fixes for #12551 @mikeslattery