Ari's tokernizers fixes