Fix on proxy and small changes