fixes incoming from master, notably for ROOT-6067