ORA fixes for ROOT 6 from Giacomo Govi

ORA fixes for ROOT 6 from Giacomo Govi.
Please merge as soon as convenient or sooner.