Small mods to VPN setups