Fixes from discussion with pat