4.0 DRIVE TRAIN HELP

im in the middle of swapping a 40 out of my 99 xj with a newer 40 from a 2000 grand cherokee. ive been told by many companies the long block is the same but i cant get the motor mounts from my 99 to work. has anyone done this swap or heard of it that can point me in the right direction thanks

I don't know if this is relevant, but I swapped a short block out of a 2005 TJ into my 90 XJ and had to grind down one of the bosses on the right side of the block and dremmel the timimg cover srea and make an additional bracket for the alternator.
Everything bolted up on the driver's side.