Fixing some small autocomplete bugs