Tokenizer tweaks