Few changes to try and improve reconnection preference.