Fix core startup routines.