#102884: Patches for newer ROOT