Fixing some Proxy/compile errors