For the stock, a very easy effective fix that I did for my Colt is take some electrical tape and put about a 3 or 4 inch strip on the left, top, and right side of the buffer tube after removing the stock. Then install the stock back on and get it to the position you want. I did that about two years ago on mine, I've shot several hundred rounds thru it and it hasn't moved or wiggled at all since I did that. Never had an issue with my handguard so can't really say on that one.