Hi, it's Rob here. Regarding the plastic pin in the colapsable shaft I've used a knitting needle, just filed it down 'till it was a few thou' over size and tapped it in.