Fixes in response to review