Fix typeaheads