Fixes for ROOT 6