Fix more token bugs