Further changes to non-standard characters