csclient: minor fixes for review