Proxifying and misc changes