Fix CLI when connecting/initializing