More little fixes found while porting changes to the ORA tree.
Authored by: cmpilato 2008-08-06
Parent: [r3253]
Child: [r3255]
