More fixups.
3 files changed