Nicer autoconnect, minor fixes