Minor CCSPI client patches.