Fixes to autocompletes