more fixes

Original commit message from CVS:
more fixes
13 files changed