A few miscellaneous changes
9 files changed