Custom cocaine client support and fixes