fixes for ROOT-5836