Various minor fixes.
9 files changed