More core review updates