ticket/21263-minor_lint_fixes

A few minor lint fixes