Minor bugfixes for file-based vpn usage