fix more issues
[skip ci] shippable build 23.1