More unicode source fixes