Fixes in response to second reviewer's comments