Correct headers for non-CDMI calls