Minor style fixes
Use Proxy from tagged instead of NatProxy