Just to clarify, as it is early and my coffee intake is low.... the roll pin provided is not a replacement for the FPB / drop safety catch, and the spring is not a replacement for the FPBSpring. But rather for the release catch and the trigger bar detent spring?