Patches updated in response to first round of reviews