Trying to fix initial connection issues