some small fixes mostly concerning the use of the wrong type
Authored by: hotzst 2008-08-30
Parent: [r608]
Child: [r610]
