More unicode related changes