The engine I bought to replace the broken one has needed some modification. We found that the fuel rail was different ( no return ) and it had inserts for the injectors in the head. We swapped over the rail from the Zaf and removed the inserts from the head, so everything seems to go back together pretty sweet. Although the new motor was from an auto, the drive plate looked slightly different so we swapped that over too.
We found we were able to get the motor out by undoing the exhaust downpipe, the alternator and the air con compressor. We left the loom on the engine along with the fuel rail and inlet / exhaust manifolds.