Fix HTTPS and CLI errors