Fix problems with joining, entity wiping