More fixes, proxy is working correctly as well.