fix some more linter issues
[skip ci] shippable build 37.1