fix more linter issues
[skip ci] shippable build 36.1