fix more non-go-gettable deps