Tokenization: token bug fixes