Fix connection info and a few other minor things