Fix core and extra links