fixes to accomodate with ROOT