More fixes down to around the last 500 diacritic errors