Hi, I have updated the patch with remaining error fixes