With the disclaimer that I don't know what I'm doing, and might just be making it worse, here's an attempt at a generic connector band-aid:
With the disclaimer that I don't know what I'm doing, and might just be making it worse, here's an attempt at a generic connector band-aid: