Fix autocomplete and --version result