fix some errors introduces in a refactor
Authored by: npaxton 2006-10-25
Parent: [r349]
Child: [r351]