Misc improvements
4 files changed