Changes needed by Root v5-04-00 (J.Lo)