Fix WITH-CTX, add WITH-SOCKS