Unicode related fixes