Tokenizer fixes