Minor tweaks for improved stability.
Authored by: jakeroberts 2008-11-17
Parent: [r800]
Child: [r802]