TK Proxy fixes