diff --git a/openvpn/omi/openvpn.cpp b/openvpn/omi/openvpn.cpp
index 60753903..ff804a17 100644
--- a/openvpn/omi/openvpn.cpp
+++ b/openvpn/omi/openvpn.cpp
@@ -363,7 +363,8 @@ private:
 	  did_query_remote = false;
 	}
 
-      const ClientAPI::EvalConfig eval = Client::eval_config_static(*config);
+      ClientAPI::OpenVPNClientHelper clihelper;
+      const ClientAPI::EvalConfig eval = clihelper.eval_config(*config);
       if (eval.error)
 	OPENVPN_THROW_EXCEPTION("eval config error: " << eval.message);
 
diff --git a/test/ovpncli/cli.cpp b/test/ovpncli/cli.cpp
index 83b59ab9..3dd50ace 100644
--- a/test/ovpncli/cli.cpp
+++ b/test/ovpncli/cli.cpp
@@ -639,7 +639,7 @@ static void start_thread(Client& client)
 {
   // Set Windows title bar
   const std::string title_text = "F2:Stats F3:Reconnect F4:Stop F5:Pause";
-  Win::Console::Title title(ClientAPI::OpenVPNClient::platform() + "     " + title_text);
+  Win::Console::Title title(ClientAPI::OpenVPNClientHelper::platform() + "     " + title_text);
   Win::Console::Input console;
 
   // start connect thread