provider/common: fix more common code