Fix joins for non-spec servers with extended-join