Lint fixes for #12665