Amended my post above to clarify, The spring on the yellow knob goes between the knob itself and the top of the gear tunnel, there is a bracket with a little cup for it to locate.
It does sound like the pin is not doing its job of holding the dog in 2wd position which is what it should be doing...