Fixes to @alex's comments