diff --git a/ballista/rust/core/Cargo.toml b/ballista/rust/core/Cargo.toml
index 74beb696c6fbb..ee6862a0d1a2d 100644
--- a/ballista/rust/core/Cargo.toml
+++ b/ballista/rust/core/Cargo.toml
@@ -42,7 +42,7 @@ tokio = "1.0"
 tonic = "0.5"
 uuid = { version = "0.8", features = ["v4"] }
 
-arrow-flight = { version = "^5.2"  }
+arrow-flight = { git = "https://github.com/apache/arrow-rs", rev = "c4e20da" }
 
 datafusion = { path = "../../../datafusion", version = "5.1.0" }
 
diff --git a/ballista/rust/core/src/serde/logical_plan/to_proto.rs b/ballista/rust/core/src/serde/logical_plan/to_proto.rs
index aa7a973dd3402..8c0ba76bf72ac 100644
--- a/ballista/rust/core/src/serde/logical_plan/to_proto.rs
+++ b/ballista/rust/core/src/serde/logical_plan/to_proto.rs
@@ -407,6 +407,7 @@ impl From<&DataType> for protobuf::arrow_type::ArrowTypeEnum {
                     fractional: *fractional as u64,
                 })
             }
+            _ => ArrowTypeEnum::None(EmptyMessage {}),
         }
     }
 }
@@ -537,7 +538,8 @@ impl TryFrom<&DataType> for protobuf::scalar_type::Datatype {
             | DataType::Struct(_)
             | DataType::Union(_)
             | DataType::Dictionary(_, _)
-            | DataType::Decimal(_, _) => {
+            | DataType::Decimal(_, _)
+            | DataType::Map(_, _) => {
                 return Err(proto_error(format!(
                     "Error converting to Datatype to scalar type, {:?} is invalid as a datafusion scalar.",
                     val
diff --git a/ballista/rust/executor/Cargo.toml b/ballista/rust/executor/Cargo.toml
index 795b8dd679ef9..56e7490ee862c 100644
--- a/ballista/rust/executor/Cargo.toml
+++ b/ballista/rust/executor/Cargo.toml
@@ -29,8 +29,8 @@ edition = "2018"
 snmalloc = ["snmalloc-rs"]
 
 [dependencies]
-arrow = { version = "^5.2"  }
-arrow-flight = { version = "^5.2"  }
+arrow = { git = "https://github.com/apache/arrow-rs", rev = "c4e20da" }
+arrow-flight = { git = "https://github.com/apache/arrow-rs", rev = "c4e20da"   }
 anyhow = "1"
 async-trait = "0.1.36"
 ballista-core = { path = "../core", version = "0.6.0" }
diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
index 008aeecfdaabc..e940baafcf0dc 100644
--- a/datafusion-cli/Cargo.toml
+++ b/datafusion-cli/Cargo.toml
@@ -31,5 +31,5 @@ clap = "2.33"
 rustyline = "8.0"
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync"] }
 datafusion = { path = "../datafusion", version = "5.1.0" }
-arrow = { version = "^5.2"  }
+arrow = { git = "https://github.com/apache/arrow-rs", rev = "c4e20da" }
 ballista = { path = "../ballista/rust/client", version = "0.6.0" }
diff --git a/datafusion/Cargo.toml b/datafusion/Cargo.toml
index e93f47e581517..bd6b863d3f90c 100644
--- a/datafusion/Cargo.toml
+++ b/datafusion/Cargo.toml
@@ -49,8 +49,8 @@ force_hash_collisions = []
 [dependencies]
 ahash = "0.7"
 hashbrown = { version = "0.11", features = ["raw"] }
-arrow = { git = "https://github.com/apache/arrow-rs", rev = "34df13a", features = ["prettyprint"] }
-parquet = { git = "https://github.com/apache/arrow-rs", rev = "34df13a", features = ["arrow"] }
+arrow = { git = "https://github.com/apache/arrow-rs", rev = "c4e20da", features = ["prettyprint"] }
+parquet = { git = "https://github.com/apache/arrow-rs", rev = "c4e20da", features = ["arrow"] }
 sqlparser = "0.10"
 paste = "^1.0"
 num_cpus = "1.13.0"