Patch causes lockup, discounting the other issues now fixed. This looks to be missing something else.