More Manual patch updates