Fixes from Steve's review