Addressed Will's comments on the patch.