fix more linter issues
[skip ci] shippable build 35.1