Updated with IIIT Proxy issues fixes