diff --git a/Cargo.lock b/Cargo.lock
index c068646..7a883a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1128,7 +1128,7 @@ dependencies = [
 [[package]]
 name = "neutron-sdk"
 version = "0.11.0"
-source = "git+https://github.com/neutron-org/neutron-sdk?branch=main#b83c182e8688f826c313cae318ff8ae908b87c81"
+source = "git+https://github.com/neutron-org/neutron-sdk?branch=feat/respect-gogoproto-nullable#0a2b67e66008bd9bb716513fca0257e0ecd4754d"
 dependencies = [
  "bech32 0.9.1",
  "chrono",
@@ -1152,7 +1152,7 @@ dependencies = [
 [[package]]
 name = "neutron-std"
 version = "5.0.0"
-source = "git+https://github.com/neutron-org/neutron-std?branch=main#25e0d0c1e7f56d40ba62908d9e2c03b5d3779bd2"
+source = "git+https://github.com/neutron-org/neutron-std?branch=feat/respect-gogoproto-nullable#dbfee8680e62a17840c9251e02e1fcf3ee2a71f3"
 dependencies = [
  "bech32 0.9.1",
  "chrono",
@@ -1176,7 +1176,7 @@ dependencies = [
 [[package]]
 name = "neutron-std-derive"
 version = "0.20.1"
-source = "git+https://github.com/neutron-org/neutron-std?branch=main#25e0d0c1e7f56d40ba62908d9e2c03b5d3779bd2"
+source = "git+https://github.com/neutron-org/neutron-std?branch=feat/respect-gogoproto-nullable#dbfee8680e62a17840c9251e02e1fcf3ee2a71f3"
 dependencies = [
  "itertools 0.10.5",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index f9dfd2f..5ce2580 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,8 +13,8 @@ incremental = false
 overflow-checks = true
 
 [workspace.dependencies]
-neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk", branch = "main" }
-neutron-std = { git = "https://github.com/neutron-org/neutron-std", branch = "main" }
+neutron-sdk = { package = "neutron-sdk", git = "https://github.com/neutron-org/neutron-sdk", branch = "feat/respect-gogoproto-nullable" }
+neutron-std = { git = "https://github.com/neutron-org/neutron-std", branch = "feat/respect-gogoproto-nullable" }
 
 prost = "0.12.4"
 prost-types = "0.12.4"
diff --git a/contracts/dex_grpc/src/contract.rs b/contracts/dex_grpc/src/contract.rs
index 00dba8f..bccba8f 100644
--- a/contracts/dex_grpc/src/contract.rs
+++ b/contracts/dex_grpc/src/contract.rs
@@ -88,12 +88,12 @@ pub fn execute(
             token_in,
             token_out,
             tick_index_in_to_out,
-            limit_sell_price,
+            limit_sell_price: Some(limit_sell_price),
             amount_in,
             order_type,
             expiration_time,
-            max_amount_out,
-            min_average_sell_price: "".to_string(),
+            max_amount_out: Some(max_amount_out),
+            min_average_sell_price: None,
         })),
         ExecuteMsg::WithdrawFilledLimitOrder { tranche_key } => {
             Ok(Response::new().add_message(MsgWithdrawFilledLimitOrder {