several vpn fixes