Patching join code for Join 3.0 changes