I have a related question as I am about to open up my CZ21. Were you able to get a gasket so it is waterproof when you put it back together? I have to replace the wiring on the battery harness and don't want to ship to Fisher from Canada for such an easy job.