More stuff to try and fix disconnects