Comment refinements
Fixing reference to rc
Tweak for Oracle