A load more tokenizer fixes