Fixex a couple of issues with the patch