Core response token fixes