Roll pins are easy. I found one the right diameter and had to cut a little off in length before I tapped it in. They even have the same finish. Once in, you cant tell its not one from the parts kit.
There is a BIC pen spring that can sub for one of the ones in a lower, not sure which one though.