Fixes to the handling of root files