Fix some handling of non-ASCII letters and spaces