Improve VPN setup