Updates for the ROOT trunk