Final set of CompareRoot changes