Fix boot so no changes to core are needed.