Fix omitted converstions from token id to operator