The other thing to keep in mind is the rubber seal that goes between the body and the flare. If you don't have those, you'll need to source them too.
I bought a non-genuine clip set and genuine...