Fix dependencies w/r to core.base