Cleaned up components , chased threads with tap and die, and found a washer that fits. Replaced cotter pins.
We still need to find a tip that fits. Standard tips do not.