fix more Q->bluebird fallout