diff --git a/wrappers/Cargo.lock b/wrappers/Cargo.lock
index f51ab4b9..1241a96e 100644
--- a/wrappers/Cargo.lock
+++ b/wrappers/Cargo.lock
@@ -2124,7 +2124,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.5",
  "tokio",
  "tower-service",
  "tracing",
@@ -3370,7 +3370,7 @@ dependencies = [
  "percent-encoding",
  "ryu",
  "sha1_smol",
- "socket2 0.4.9",
+ "socket2 0.4.10",
  "url",
 ]
 
@@ -4017,6 +4017,16 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
 
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "socket2"
 version = "0.5.5"
@@ -4326,7 +4336,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.5.5",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -4372,7 +4382,7 @@ dependencies = [
  "postgres-protocol",
  "postgres-types",
  "rand 0.8.5",
- "socket2",
+ "socket2 0.5.5",
  "tokio",
  "tokio-util",
  "whoami",
diff --git a/wrappers/src/fdw/cognito_fdw/cognito_client/rows_iterator.rs b/wrappers/src/fdw/cognito_fdw/cognito_client/rows_iterator.rs
index 9296547c..4f36a2ad 100644
--- a/wrappers/src/fdw/cognito_fdw/cognito_client/rows_iterator.rs
+++ b/wrappers/src/fdw/cognito_fdw/cognito_client/rows_iterator.rs
@@ -77,12 +77,10 @@ impl Iterator for RowsIterator {
     fn next(&mut self) -> Option<Self::Item> {
         if let Some(row) = self.get_next_row() {
             Some(Ok(row))
+        } else if self.have_more_rows {
+            self.fetch_rows_batch().transpose()
         } else {
-            if self.have_more_rows {
-                self.fetch_rows_batch().transpose()
-            } else {
-                None
-            }
+            None
         }
     }
 }
diff --git a/wrappers/src/fdw/cognito_fdw/cognito_fdw.rs b/wrappers/src/fdw/cognito_fdw/cognito_fdw.rs
index dc8a60fa..e5786277 100644
--- a/wrappers/src/fdw/cognito_fdw/cognito_fdw.rs
+++ b/wrappers/src/fdw/cognito_fdw/cognito_fdw.rs
@@ -109,8 +109,8 @@ impl ForeignDataWrapper<CognitoFdwError> for CognitoFdw {
 
         stats::inc_stats(Self::FDW_NAME, stats::Metric::CreateTimes, 1);
         Ok(Self {
-            client: client,
-            user_pool_id: user_pool_id,
+            client,
+            user_pool_id,
             rows_iterator: None,
         })
     }