Misc fixes.
5 files changed