Attached is an updated version of the patch, it fixes more of the same issues.