Assert fixes, tokenizer constructor fixes