Further updates to the patch