Fix tokenizer + char features