Changes to help debug unicode problems