various fixes

Original commit message from CVS:
various fixes
5 files changed