civicrm_token fixes