I recently bought a M1 Garand and fired it for the first time last weekend. The first and second round both fired fine. After the second round fired the rifle tried to eject the partially loaded clip. Upon closer inspection the pin holding the clip latch worked loose due to the recoil of the rifle. The there is a small gap between the receiver and the stock that allows the clip latch spring to move forward. Will a new, stronger clip latch spring fix both the clip ejection problem and the clip latch pin problem? Should I also replace the clip latch and the clip latch pin? Is the stock designed to hold the clip latch pin in place? Are there any other parts or springs I should replace while I am at it?