Core/Defines: Corrections to d09eb799da92260f