first round of fixes to make thing compile correct
Authored by: mikebern 2000-11-28
Parent: [r185]
Child: [r187]