I have an old hobie 14, with a flexing problem, The cross beams appear to be loose in the corner castings, as the pop rivits that hold them in no longer are tight in the holes. has any one else had this problem?, is it best to re rivet, or replace the rivits with stainless steel self tappers. I dont want to epoxy as I car-top the boat. any suggestions?