fix more bugs
[skip ci] shippable build 46.1