Spring lock wire & channels are a worthwhile investment, if you haven't considered it.