diff --git a/plugins/commands/serve/client/communicator.rb b/plugins/commands/serve/client/communicator.rb
index 9e89c68a0..0b83e85c7 100644
--- a/plugins/commands/serve/client/communicator.rb
+++ b/plugins/commands/serve/client/communicator.rb
@@ -168,12 +168,7 @@ module VagrantPlugins
         protected
 
         def generate_execution_request(machine, cmd, opts={})
-          # opts.each do |k,v| 
-          #   val = Google::Protobuf::Value.new
-          #   val.from_ruby(v)
-          #   opts[k] = val
-          # end
-
+          opts.transform_values! { |v| v.is_a?(Symbol) ? v.to_s : v}
           opts_struct = Google::Protobuf::Struct.from_hash(
             opts.transform_keys(&:to_s)
           )
diff --git a/plugins/commands/serve/service/communicator_service.rb b/plugins/commands/serve/service/communicator_service.rb
index 1b5b65445..679458423 100644
--- a/plugins/commands/serve/service/communicator_service.rb
+++ b/plugins/commands/serve/service/communicator_service.rb
@@ -232,7 +232,7 @@ module VagrantPlugins
 
             plugin = Vagrant.plugin("2").manager.communicators[plugin_name.to_s.to_sym]
             communicator = plugin.new(machine)
-            exit_code = communicator.execute(cmd, opts)
+            exit_code = communicator.execute(cmd.command, opts)
             logger.debug("command exit code: #{exit_code}")
 
             SDK::Communicator::ExecuteResp.new(