Fix autocompletion for commands