Andrew - apologies for this, I managed to miss some unusued variable warnings in this nommu workaround, once you take the v3 could you apply this trivial fix-patch on top to resolve that? I tested this locally to confirm it resolves the problem. Thanks! ----8<----