Structs keep disconnecting in 4.12

This is still a threat :c bump

The remaining files just need to be put in the master that should fix it!