Fix AWS prompt stuff properly
Use right autocompletion functions