Fixes from brad's review