autocompletion fixes