Changes to compile with Root6