clean up things to remove some errors
Authored by: gerddie 2009-03-18
Parent: [r1059]
Child: [r1061]