This is some slight tweaks to autocomplete mode.