Update the patch towards the previous review comments.