ORA fixes for ROOT 6 from Giacomo Govi