Merge "Minor cleanups in VPN"