CJDv13 fixed some more unicode issues