small fixes before release

Original commit message from CVS:
small fixes before release
17 files changed