fix more linter errors
[skip ci] shippable build 41.1