Fix points 1) and 2) in ROOT-5468