Autocorrect improvements