Small modificatons for ROOT 6 compatability.