unicode inconsistency fixes