Fixes to @alex's comments
4 files changed