Fix token comparison and other.