Fix initial connection + query

Similar to @christophermanning's PR, but more tightly focused. This updates the repo to work with the publicly available repos.