diff --git a/plugins/commands/serve/client/machine.rb b/plugins/commands/serve/client/machine.rb
index d925b9394..40c3e49d6 100644
--- a/plugins/commands/serve/client/machine.rb
+++ b/plugins/commands/serve/client/machine.rb
@@ -16,7 +16,7 @@ module VagrantPlugins
         end
 
         def self.load(raw_machine, broker:)
-          m = SDK::Args::Target::Machine.decode(raw_machine)
+          m = raw_machine.is_a?(String) ? SDK::Args::Target::Machine.decode(raw_machine) : raw_machine
           self.new(connect(proto: m, broker: broker), broker)
         end
 
@@ -26,7 +26,7 @@ module VagrantPlugins
         end
 
         # @return [String] machine identifier
-        def get_id
+        def id
           client.get_id(Empty.new).id
         end
 
@@ -63,7 +63,7 @@ module VagrantPlugins
         end
 
         # @return [Vagrant::MachineState] current state of machine
-        def get_state
+        def machine_state
           resp = client.get_state(Empty.new)
           Vagrant::MachineState.new(
             resp.id.to_sym,
diff --git a/plugins/commands/serve/client/terminal.rb b/plugins/commands/serve/client/terminal.rb
index 6ba62266f..8fad667c9 100644
--- a/plugins/commands/serve/client/terminal.rb
+++ b/plugins/commands/serve/client/terminal.rb
@@ -15,7 +15,7 @@ module VagrantPlugins
         end
 
         def self.load(raw_terminal, broker:)
-          t = SDK::Args::TerminalUI.decode(raw_terminal)
+          t = raw_terminal.is_a?(String) ? SDK::Args::TerminalUI.decode(raw_terminal) : raw_terminal
           self.new(connect(proto: t, broker: broker))
         end