Changes to compile with Root6 on macosx64