Fix exchange/connection fails