You may need to keep the rivet and washer, the rivet that came with mine was smaller.
The spring must go with the end that is more tightly wound pushed onto the lock or it jams. You have to insert it with the key turned, but that will be obvious when you try it.