Some fixes for the bad merge at r16679.
Authored by: bugman 2012-06-06
Parent: [r16681]
Child: [r16683]