Thanks for your feedback. I did a bit of debugging and found one of the upgrades don't apply properly - just patched the fix.