Minor fixes for connection errors. Now connects to recent G2s.