Unicode compatibility improvements