Small updates to the detokenizer