Non-ASCII fixes