fix dependencies on old core modules that have been merged to core.base