Fixing some more problems related to removing core/extras