diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a67b80373cc..b81bec3f8dc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -698,6 +698,10 @@ function(build_loadable_extension_directory NAME OUTPUT_DIRECTORY PARAMETERS)
   set_target_properties(${TARGET_NAME} PROPERTIES SUFFIX
           ".duckdb_extension")
 
+  if(EMSCRIPTEN)
+    set_target_properties(${TARGET_NAME} PROPERTIES SUFFIX ".duckdb_extension.wasm")
+  endif()
+
   if(MSVC)
     set_target_properties(
             ${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG
@@ -706,6 +710,21 @@ function(build_loadable_extension_directory NAME OUTPUT_DIRECTORY PARAMETERS)
             ${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE
             "${CMAKE_BINARY_DIR}/${OUTPUT_DIRECTORY}")
   endif()
+
+  if(EMSCRIPTEN)
+    # Copy file.duckdb_extension.wasm to file.duckdb_extension.wasm.lib
+    add_custom_command(
+      TARGET ${TARGET_NAME}
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${TARGET_NAME}> $<TARGET_FILE:${TARGET_NAME}>.lib
+      )
+    # Compile the library into the actual wasm file
+    add_custom_command(
+      TARGET ${TARGET_NAME}
+      POST_BUILD
+      COMMAND emcc $<TARGET_FILE:${TARGET_NAME}>.lib -o $<TARGET_FILE:${TARGET_NAME}> -sSIDE_MODULE=1 -O3
+      )
+  endif()
 endfunction()
 
 function(build_loadable_extension NAME PARAMETERS)
diff --git a/Makefile b/Makefile
index 013209d9c984..a67ee10222d6 100644
--- a/Makefile
+++ b/Makefile
@@ -269,20 +269,17 @@ release: ${EXTENSION_CONFIG_STEP}
 wasm_mvp: ${EXTENSION_CONFIG_STEP}
 	mkdir -p ./build/wasm_mvp && \
 	emcmake cmake $(GENERATOR) -DWASM_LOADABLE_EXTENSIONS=1 -DBUILD_EXTENSIONS_ONLY=1 -Bbuild/wasm_mvp -DCMAKE_CXX_FLAGS="-DDUCKDB_CUSTOM_PLATFORM=wasm_mvp" && \
-	emmake make -j8 -Cbuild/wasm_mvp && \
-	cd build/wasm_mvp && bash ../../scripts/link-wasm-extensions.sh
+	emmake make -j8 -Cbuild/wasm_mvp
 
 wasm_eh: ${EXTENSION_CONFIG_STEP}
 	mkdir -p ./build/wasm_eh && \
 	emcmake cmake $(GENERATOR) -DWASM_LOADABLE_EXTENSIONS=1 -DBUILD_EXTENSIONS_ONLY=1 -Bbuild/wasm_eh -DCMAKE_CXX_FLAGS="-fwasm-exceptions -DWEBDB_FAST_EXCEPTIONS=1 -DDUCKDB_CUSTOM_PLATFORM=wasm_eh" && \
-	emmake make -j8 -Cbuild/wasm_eh && \
-	cd build/wasm_eh && bash ../../scripts/link-wasm-extensions.sh
+	emmake make -j8 -Cbuild/wasm_eh
 
 wasm_threads: ${EXTENSION_CONFIG_STEP}
 	mkdir -p ./build/wasm_threads && \
 	emcmake cmake $(GENERATOR) -DWASM_LOADABLE_EXTENSIONS=1 -DBUILD_EXTENSIONS_ONLY=1 -Bbuild/wasm_threads -DCMAKE_CXX_FLAGS="-fwasm-exceptions -DWEBDB_FAST_EXCEPTIONS=1 -DWITH_WASM_THREADS=1 -DWITH_WASM_SIMD=1 -DWITH_WASM_BULK_MEMORY=1 -DDUCKDB_CUSTOM_PLATFORM=wasm_threads" && \
-	emmake make -j8 -Cbuild/wasm_threads && \
-	cd build/wasm_threads && bash ../../scripts/link-wasm-extensions.sh
+	emmake make -j8 -Cbuild/wasm_threads
 
 cldebug: ${EXTENSION_CONFIG_STEP}
 	mkdir -p ./build/cldebug && \
diff --git a/extension/autocomplete/autocomplete_extension.cpp b/extension/autocomplete/autocomplete_extension.cpp
index de7ec6b39dd4..b81c8dd32ba2 100644
--- a/extension/autocomplete/autocomplete_extension.cpp
+++ b/extension/autocomplete/autocomplete_extension.cpp
@@ -82,7 +82,7 @@ static vector<string> InitialKeywords() {
 	return vector<string> {"SELECT",     "INSERT",   "DELETE",  "UPDATE",  "CREATE",   "DROP",      "COPY",
 	                       "ALTER",      "WITH",     "EXPORT",  "BEGIN",   "VACUUM",   "PREPARE",   "EXECUTE",
 	                       "DEALLOCATE", "CALL",     "ANALYZE", "EXPLAIN", "DESCRIBE", "SUMMARIZE", "LOAD",
-	                       "CHECKPOINT", "ROLLBACK", "COMMIT",  "CALL"};
+	                       "CHECKPOINT", "ROLLBACK", "COMMIT",  "CALL",    "FROM"};
 }
 
 static vector<AutoCompleteCandidate> SuggestKeyword(ClientContext &context) {
@@ -90,7 +90,7 @@ static vector<AutoCompleteCandidate> SuggestKeyword(ClientContext &context) {
 	vector<AutoCompleteCandidate> result;
 	for (auto &kw : keywords) {
 		auto score = 0;
-		if (kw == "SELECT" || kw == "DELETE" || kw == "INSERT" || kw == "UPDATE") {
+		if (kw == "FROM" || kw == "SELECT" || kw == "DELETE" || kw == "INSERT" || kw == "UPDATE") {
 			score = 1;
 		}
 		result.emplace_back(kw + " ", score);
diff --git a/extension/httpfs/include/s3fs.hpp b/extension/httpfs/include/s3fs.hpp
index 4c0e23234225..ac9b54ef4179 100644
--- a/extension/httpfs/include/s3fs.hpp
+++ b/extension/httpfs/include/s3fs.hpp
@@ -104,8 +104,8 @@ class S3FileHandle : public HTTPFileHandle {
 	S3FileHandle(FileSystem &fs, string path_p, uint8_t flags, const HTTPParams &http_params,
 	             const S3AuthParams &auth_params_p, const S3ConfigParams &config_params_p)
 	    : HTTPFileHandle(fs, std::move(path_p), flags, http_params), auth_params(auth_params_p),
-	      config_params(config_params_p) {
-
+	      config_params(config_params_p), uploads_in_progress(0), parts_uploaded(0), upload_finalized(false),
+	      uploader_has_error(false), upload_exception(nullptr) {
 		if (flags & FileFlags::FILE_FLAGS_WRITE && flags & FileFlags::FILE_FLAGS_READ) {
 			throw NotImplementedException("Cannot open an HTTP file for both reading and writing");
 		} else if (flags & FileFlags::FILE_FLAGS_APPEND) {
diff --git a/extension/httpfs/s3fs.cpp b/extension/httpfs/s3fs.cpp
index a165cb9fe2f8..109ba55bc46a 100644
--- a/extension/httpfs/s3fs.cpp
+++ b/extension/httpfs/s3fs.cpp
@@ -266,7 +266,9 @@ void S3FileHandle::Close() {
 	auto &s3fs = (S3FileSystem &)file_system;
 	if ((flags & FileFlags::FILE_FLAGS_WRITE) && !upload_finalized) {
 		s3fs.FlushAllBuffers(*this);
-		s3fs.FinalizeMultipartUpload(*this);
+		if (parts_uploaded) {
+			s3fs.FinalizeMultipartUpload(*this);
+		}
 	}
 }
 
@@ -424,6 +426,7 @@ void S3FileSystem::FlushAllBuffers(S3FileHandle &file_handle) {
 
 void S3FileSystem::FinalizeMultipartUpload(S3FileHandle &file_handle) {
 	auto &s3fs = (S3FileSystem &)file_handle.file_system;
+	file_handle.upload_finalized = true;
 
 	std::stringstream ss;
 	ss << "<CompleteMultipartUpload xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">";
@@ -452,7 +455,6 @@ void S3FileSystem::FinalizeMultipartUpload(S3FileHandle &file_handle) {
 	if (open_tag_pos == string::npos) {
 		throw IOException("Unexpected response during S3 multipart upload finalization: %d\n\n%s", res->code, result);
 	}
-	file_handle.upload_finalized = true;
 }
 
 // Wrapper around the BufferManager::Allocate to that allows limiting the number of buffers that will be handed out
@@ -826,10 +828,6 @@ void S3FileHandle::Initialize(FileOpener *opener) {
 		D_ASSERT(part_size * max_part_count >= config_params.max_file_size);
 
 		multipart_upload_id = s3fs.InitializeMultipartUpload(*this);
-
-		uploads_in_progress = 0;
-		parts_uploaded = 0;
-		upload_finalized = false;
 	}
 }
 
diff --git a/scripts/link-wasm-extensions.sh b/scripts/link-wasm-extensions.sh
deleted file mode 100644
index e5206608a8df..000000000000
--- a/scripts/link-wasm-extensions.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-trap exit SIGINT
-
-mkdir -p built_extensions
-shopt -s nullglob
-shopt -s globstar
-
-FILES="extension/**/*.duckdb_extension"
-for f in $FILES
-do
-        ext=`basename $f .duckdb_extension`
-        echo $ext
-        emcc $f -sSIDE_MODULE=1 -o built_extensions/$ext.duckdb_extension.wasm -O3
-done
-
-ls -la built_extensions
diff --git a/src/execution/index/art/art.cpp b/src/execution/index/art/art.cpp
index b7e6c7750102..32c16c19e925 100644
--- a/src/execution/index/art/art.cpp
+++ b/src/execution/index/art/art.cpp
@@ -911,11 +911,11 @@ string ART::GenerateConstraintErrorMessage(VerifyExistenceType verify_type, cons
 	case VerifyExistenceType::APPEND: {
 		// APPEND to PK/UNIQUE table, but node/key already exists in PK/UNIQUE table
 		string type = IsPrimary() ? "primary key" : "unique";
-		return StringUtil::Format(
-		    "Duplicate key \"%s\" violates %s constraint. "
-		    "If this is an unexpected constraint violation please double "
-		    "check with the known index limitations section in our documentation (docs - sql - indexes).",
-		    key_name, type);
+		return StringUtil::Format("Duplicate key \"%s\" violates %s constraint. "
+		                          "If this is an unexpected constraint violation please double "
+		                          "check with the known index limitations section in our documentation "
+		                          "(https://duckdb.org/docs/sql/indexes).",
+		                          key_name, type);
 	}
 	case VerifyExistenceType::APPEND_FK: {
 		// APPEND_FK to FK table, node/key does not exist in PK/UNIQUE table
diff --git a/src/execution/operator/persistent/physical_insert.cpp b/src/execution/operator/persistent/physical_insert.cpp
index 8e91ae202094..1dd14127d232 100644
--- a/src/execution/operator/persistent/physical_insert.cpp
+++ b/src/execution/operator/persistent/physical_insert.cpp
@@ -298,7 +298,7 @@ static void RegisterUpdatedRows(InsertLocalState &lstate, const Vector &row_ids,
 		auto result = updated_rows.insert(data[i]);
 		if (result.second == false) {
 			throw InvalidInputException(
-			    "ON CONFLICT DO UPDATE can not update the same row twice in the same command, Ensure that no rows "
+			    "ON CONFLICT DO UPDATE can not update the same row twice in the same command. Ensure that no rows "
 			    "proposed for insertion within the same command have duplicate constrained values");
 		}
 	}
diff --git a/src/main/database_manager.cpp b/src/main/database_manager.cpp
index 366cb4f4c9c5..c6cc705d36ee 100644
--- a/src/main/database_manager.cpp
+++ b/src/main/database_manager.cpp
@@ -94,7 +94,12 @@ optional_ptr<AttachedDatabase> DatabaseManager::GetDatabaseFromPath(ClientContex
 
 void DatabaseManager::CheckPathConflict(ClientContext &context, const string &path) {
 	// ensure that we did not already attach a database with the same path
-	if (db_paths.find(path) != db_paths.end()) {
+	bool path_exists;
+	{
+		lock_guard<mutex> path_lock(db_paths_lock);
+		path_exists = db_paths.find(path) != db_paths.end();
+	}
+	if (path_exists) {
 		// check that the database is actually still attached
 		auto entry = GetDatabaseFromPath(context, path);
 		if (entry) {
@@ -109,8 +114,8 @@ void DatabaseManager::InsertDatabasePath(ClientContext &context, const string &p
 		return;
 	}
 
-	lock_guard<mutex> path_lock(db_paths_lock);
 	CheckPathConflict(context, path);
+	lock_guard<mutex> path_lock(db_paths_lock);
 	db_paths.insert(path);
 }
 
@@ -141,7 +146,6 @@ void DatabaseManager::GetDatabaseType(ClientContext &context, string &db_type, A
 
 	// try to extract database type from path
 	if (db_type.empty()) {
-		lock_guard<mutex> path_lock(db_paths_lock);
 		CheckPathConflict(context, info.path);
 
 		DBPathAndType::CheckMagicBytes(info.path, db_type, config);
diff --git a/src/optimizer/filter_combiner.cpp b/src/optimizer/filter_combiner.cpp
index c612b177f72b..89df31775d3c 100644
--- a/src/optimizer/filter_combiner.cpp
+++ b/src/optimizer/filter_combiner.cpp
@@ -608,7 +608,9 @@ FilterResult FilterCombiner::AddBoundComparisonFilter(Expression &expr) {
 		// get the current bucket of constant values
 		D_ASSERT(constant_values.find(equivalence_set) != constant_values.end());
 		auto &info_list = constant_values.find(equivalence_set)->second;
-		D_ASSERT(node.return_type == info.constant.type());
+		if (node.return_type != info.constant.type()) {
+			return FilterResult::UNSUPPORTED;
+		}
 		// check the existing constant comparisons to see if we can do any pruning
 		auto ret = AddConstantComparison(info_list, info);
 
diff --git a/src/optimizer/rule/move_constants.cpp b/src/optimizer/rule/move_constants.cpp
index 9749213b11a5..d6b4436bdca1 100644
--- a/src/optimizer/rule/move_constants.cpp
+++ b/src/optimizer/rule/move_constants.cpp
@@ -21,8 +21,12 @@ MoveConstantsRule::MoveConstantsRule(ExpressionRewriter &rewriter) : Rule(rewrit
 	arithmetic->function = make_uniq<ManyFunctionMatcher>(unordered_set<string> {"+", "-", "*"});
 	// we match only on integral numeric types
 	arithmetic->type = make_uniq<IntegerTypeMatcher>();
-	arithmetic->matchers.push_back(make_uniq<ConstantExpressionMatcher>());
-	arithmetic->matchers.push_back(make_uniq<ExpressionMatcher>());
+	auto child_constant_matcher = make_uniq<ConstantExpressionMatcher>();
+	auto child_expression_matcher = make_uniq<ExpressionMatcher>();
+	child_constant_matcher->type = make_uniq<IntegerTypeMatcher>();
+	child_expression_matcher->type = make_uniq<IntegerTypeMatcher>();
+	arithmetic->matchers.push_back(std::move(child_constant_matcher));
+	arithmetic->matchers.push_back(std::move(child_expression_matcher));
 	arithmetic->policy = SetMatcher::Policy::SOME;
 	op->matchers.push_back(std::move(arithmetic));
 	root = std::move(op);
@@ -34,9 +38,8 @@ unique_ptr<Expression> MoveConstantsRule::Apply(LogicalOperator &op, vector<refe
 	auto &outer_constant = bindings[1].get().Cast<BoundConstantExpression>();
 	auto &arithmetic = bindings[2].get().Cast<BoundFunctionExpression>();
 	auto &inner_constant = bindings[3].get().Cast<BoundConstantExpression>();
-	if (!TypeIsIntegral(arithmetic.return_type.InternalType())) {
-		return nullptr;
-	}
+	D_ASSERT(arithmetic.return_type.IsIntegral());
+	D_ASSERT(arithmetic.children[0]->return_type.IsIntegral());
 	if (inner_constant.value.IsNull() || outer_constant.value.IsNull()) {
 		return make_uniq<BoundConstantExpression>(Value(comparison.return_type));
 	}
diff --git a/src/optimizer/rule/regex_optimizations.cpp b/src/optimizer/rule/regex_optimizations.cpp
index d1f49121bb4f..00f332ea8d13 100644
--- a/src/optimizer/rule/regex_optimizations.cpp
+++ b/src/optimizer/rule/regex_optimizations.cpp
@@ -143,13 +143,13 @@ unique_ptr<Expression> RegexOptimizationRule::Apply(LogicalOperator &op, vector<
 
 	auto constant_value = ExpressionExecutor::EvaluateScalar(GetContext(), constant_expr);
 	D_ASSERT(constant_value.type() == constant_expr.return_type);
-	auto patt_str = StringValue::Get(constant_value);
 
 	duckdb_re2::RE2::Options parsed_options = regexp_bind_data.options;
 
 	if (constant_expr.value.IsNull()) {
 		return make_uniq<BoundConstantExpression>(Value(root.return_type));
 	}
+	auto patt_str = StringValue::Get(constant_value);
 
 	// the constant_expr is a scalar expression that we have to fold
 	if (!constant_expr.IsFoldable()) {
diff --git a/test/api/adbc/test_adbc.cpp b/test/api/adbc/test_adbc.cpp
index b5e34dbcbbc4..00e860a7285f 100644
--- a/test/api/adbc/test_adbc.cpp
+++ b/test/api/adbc/test_adbc.cpp
@@ -162,9 +162,14 @@ TEST_CASE("Test Invalid Path", "[adbc]") {
 
 	REQUIRE(!SUCCESS(AdbcDatabaseInit(&adbc_database, &adbc_error)));
 
-	REQUIRE(std::strcmp(
-	            adbc_error.message,
-	            "IO Error: Cannot open file \"/this/path/is/imaginary/hopefully/\": No such file or directory") == 0);
+	if (!adbc_error.message) {
+		REQUIRE(false);
+	} else {
+		REQUIRE(std::strcmp(
+		            adbc_error.message,
+		            "IO Error: Cannot open file \"/this/path/is/imaginary/hopefully/\": No such file or directory") ==
+		        0);
+	}
 }
 
 TEST_CASE("Error Release", "[adbc]") {
diff --git a/test/api/serialized_plans/serialized_plans.binary b/test/api/serialized_plans/serialized_plans.binary
index 9d2f1c604627..996645e3e423 100644
Binary files a/test/api/serialized_plans/serialized_plans.binary and b/test/api/serialized_plans/serialized_plans.binary differ
diff --git a/test/api/test_progress_bar.cpp b/test/api/test_progress_bar.cpp
index 9894eae8e791..df651c8fd580 100644
--- a/test/api/test_progress_bar.cpp
+++ b/test/api/test_progress_bar.cpp
@@ -57,6 +57,7 @@ class TestProgressBar {
 };
 
 TEST_CASE("Test Progress Bar Fast", "[api]") {
+	return;
 	DuckDB db(nullptr);
 	Connection con(db);
 	REQUIRE_NOTHROW(con.context->GetQueryProgress());
diff --git a/test/arrow/arrow_roundtrip.cpp b/test/arrow/arrow_roundtrip.cpp
index 53337a58c594..d7e33fc7d706 100644
--- a/test/arrow/arrow_roundtrip.cpp
+++ b/test/arrow/arrow_roundtrip.cpp
@@ -74,8 +74,8 @@ TEST_CASE("Test arrow roundtrip", "[arrow]") {
 	// FIXME: there seems to be a bug in the enum arrow reader in this test when run with vsize=2
 	return;
 #endif
-	TestArrowRoundtrip("SELECT * EXCLUDE(bit,time_tz,uhugeint) REPLACE "
-	                   "(interval (1) seconds AS interval, hugeint::DOUBLE as hugeint) "
+	TestArrowRoundtrip("SELECT * EXCLUDE(bit,time_tz) REPLACE "
+	                   "(interval (1) seconds AS interval, hugeint::DOUBLE as hugeint, uhugeint::DOUBLE as uhugeint) "
 	                   "FROM test_all_types()");
 }
 
diff --git a/test/fuzzer/sqlsmith/window-rows-overflow.test b/test/fuzzer/sqlsmith/window-rows-overflow.test
index e8995e99b35f..7a39e68821fe 100644
--- a/test/fuzzer/sqlsmith/window-rows-overflow.test
+++ b/test/fuzzer/sqlsmith/window-rows-overflow.test
@@ -13,7 +13,6 @@ create table all_types as
 		small_enum,
 		medium_enum,
 		large_enum,
-		uhugeint
 	)
 from test_all_types();
 
diff --git a/test/sql/copy/s3/fully_qualified_s3_url.test b/test/sql/copy/s3/fully_qualified_s3_url.test
index b6918d868b41..88d3eb156eb0 100644
--- a/test/sql/copy/s3/fully_qualified_s3_url.test
+++ b/test/sql/copy/s3/fully_qualified_s3_url.test
@@ -8,11 +8,6 @@ require httpfs
 
 require-env S3_TEST_SERVER_AVAILABLE 1
 
-# FIXME - this test randomly fails in the CI
-# # terminate called after throwing an instance of 'duckdb::IOException'
-#   what():  IO Error: Unexpected response during S3 multipart upload finalization: 403
-mode skip
-
 # Require that these environment variables are also set
 
 require-env AWS_DEFAULT_REGION
diff --git a/test/sql/copy/s3/upload_large_file.test_slow b/test/sql/copy/s3/upload_large_file.test_slow
index 652708baaa7e..3942799402f8 100644
--- a/test/sql/copy/s3/upload_large_file.test_slow
+++ b/test/sql/copy/s3/upload_large_file.test_slow
@@ -27,7 +27,7 @@ set ignore_error_messages
 
 # confirm we use a reasonable amount of memory
 statement ok
-SET memory_limit='2.2GB';
+SET memory_limit='2.5GB';
 
 statement ok
 set http_timeout=120000;
diff --git a/test/sql/function/string/regex_search.test b/test/sql/function/string/regex_search.test
index 4637432f7f51..c107c1402301 100644
--- a/test/sql/function/string/regex_search.test
+++ b/test/sql/function/string/regex_search.test
@@ -5,40 +5,49 @@
 statement ok
 PRAGMA enable_verification
 
+statement ok
+CREATE TABLE t0 as FROM VALUES('asdf') t(c0);
+
+# null
+query I
+SELECT regexp_matches(c0, NULL) from t0
+----
+NULL
+
 # constant strings
 query T
-SELECT regexp_matches('asdf', '.*sd.*')
+SELECT regexp_matches(c0, '.*sd.*') from t0;
 ----
 1
 
 query T
-SELECT regexp_matches('asdf', '.*yu.*')
+SELECT regexp_matches(c0, '.*yu.*') from t0;
 ----
 0
 
 query T
-SELECT regexp_matches('asdf', '')
+SELECT regexp_matches(c0, '') from t0;
 ----
 1
 
 # partial matches okay
 query T
-SELECT regexp_matches('asdf', 'sd')
+SELECT regexp_matches(c0, 'sd') from t0;
 ----
 1
 
 query T
-SELECT regexp_full_match('asdf', 'sd')
+SELECT regexp_full_match(c0, 'sd') from t0;
 ----
 0
 
 query T
-SELECT regexp_full_match('asdf', '.sd.')
+SELECT regexp_full_match(c0, '.sd.') from t0;
 ----
 1
 
 query T
-SELECT regexp_matches('asdf', '^sdf$')
+SELECT regexp_matches(c0, '^sdf$') from t0;
 ----
 0
 
@@ -55,7 +64,7 @@ SELECT regexp_matches('', '.*')
 
 # NULLs
 query T
-SELECT regexp_matches('asdf', CAST(NULL AS STRING))
+SELECT regexp_matches(c0, CAST(NULL AS STRING)) from t0;
 ----
 NULL
 
@@ -103,12 +112,12 @@ NULL
 # test regex_matches with options
 # case sensitivity
 query T
-SELECT regexp_matches('asdf', '.*SD.*', 'i')
+SELECT regexp_matches(c0, '.*SD.*', 'i') from t0;
 ----
 1
 
 query T
-SELECT regexp_matches('asdf', '.*SD.*', 'c')
+SELECT regexp_matches(c0, '.*SD.*', 'c') from t0;
 ----
 0
 
@@ -138,13 +147,13 @@ world', '.*', 'n')
 
 # whitespace is ignored
 query T
-SELECT regexp_matches('asdf', '.*SD.*', ' i 	')
+SELECT regexp_matches(c0, '.*SD.*', ' i 	') from t0;
 ----
 1
 
 # NULL in options is an error
 statement error
-SELECT regexp_matches('asdf', '.*SD.*', NULL)
+SELECT regexp_matches(c0, '.*SD.*', NULL) from t0;
 ----
 must not be NULL
 
@@ -172,11 +181,11 @@ SELECT regexp_matches(v, 'h.*', v) FROM test ORDER BY v
 
 # throw on invalid options
 statement error
-SELECT regexp_matches('asdf', '.*SD.*', 'q')
+SELECT regexp_matches(c0, '.*SD.*', 'q') from t0;
 
 # can only use "g" with regexp replace
 statement error
-SELECT regexp_matches('asdf', '.*SD.*', 'g')
+SELECT regexp_matches(c0, '.*SD.*', 'g') from t0;
 
 # error in non-constant regex
 statement ok
diff --git a/test/sql/index/art/constraints/test_art_eager_constraint_checking.test b/test/sql/index/art/constraints/test_art_eager_constraint_checking.test
index 23a5bed2acd9..2616927a65ad 100644
--- a/test/sql/index/art/constraints/test_art_eager_constraint_checking.test
+++ b/test/sql/index/art/constraints/test_art_eager_constraint_checking.test
@@ -22,7 +22,7 @@ INSERT INTO u VALUES (1, NULL);
 statement error
 UPDATE u SET ju = 1 WHERE iu = 1;
 ----
-Constraint Error: Duplicate key "iu: 1" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
+Constraint Error: Duplicate key "iu: 1" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
 
 # issue #5807
 
@@ -38,7 +38,7 @@ SELECT 1, 41;
 statement error
 UPDATE tunion SET u = 42 WHERE id = 1;
 ----
-Constraint Error: Duplicate key "id: 1" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
+Constraint Error: Duplicate key "id: 1" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
 
 # issue #5771
 
@@ -57,7 +57,7 @@ UPDATE workers SET phone = '345' WHERE id = 1;
 statement error
 UPDATE workers SET worker = 'leo' WHERE id = 1;
 ----
-Constraint Error: Duplicate key "id: 1" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
+Constraint Error: Duplicate key "id: 1" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
 
 # issue #4886
 
@@ -80,7 +80,7 @@ UPDATE test SET i = 4 WHERE i = 1;
 statement error
 INSERT INTO test VALUES (1);
 ----
-Constraint Error: Duplicate key "i: 1" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
+Constraint Error: Duplicate key "i: 1" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
 
 statement ok
 ROLLBACK
@@ -104,6 +104,6 @@ UPDATE tbl
 SET sometext = 'ghi', someothertext = 'mno'
 WHERE id = 2;
 ----
-Constraint Error: Duplicate key "id: 2" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
+Constraint Error: Duplicate key "id: 2" violates primary key constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
 
 
diff --git a/test/sql/index/art/issues/test_art_issue_7349.test b/test/sql/index/art/issues/test_art_issue_7349.test
index 61428a233355..1542eef5735a 100644
--- a/test/sql/index/art/issues/test_art_issue_7349.test
+++ b/test/sql/index/art/issues/test_art_issue_7349.test
@@ -38,7 +38,7 @@ INSERT INTO tab0 VALUES('2006-12-25');
 statement error
 INSERT INTO td VALUES (date '2008-02-29');
 ----
-Constraint Error: Duplicate key "tz: 2008-02-29" violates unique constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
+Constraint Error: Duplicate key "tz: 2008-02-29" violates unique constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
 
 statement ok
 COMMIT TRANSACTION;
@@ -54,7 +54,7 @@ INSERT INTO tab0 VALUES('2006-12-25');
 statement error
 INSERT INTO td VALUES (date '2008-02-29');
 ----
-Constraint Error: Duplicate key "tz: 2008-02-29" violates unique constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
+Constraint Error: Duplicate key "tz: 2008-02-29" violates unique constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
 
 statement ok
 COMMIT TRANSACTION;
diff --git a/test/sql/index/art/types/test_art_union.test b/test/sql/index/art/types/test_art_union.test
index c10a339a8907..95c0ab668ff4 100644
--- a/test/sql/index/art/types/test_art_union.test
+++ b/test/sql/index/art/types/test_art_union.test
@@ -108,7 +108,7 @@ restart
 statement error
 INSERT INTO tbl VALUES ('helloo', 'nop', 7, true);
 ----
-Constraint Error: Duplicate key "union_extract(u_2, 'string'): helloo" violates unique constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
+Constraint Error: Duplicate key "union_extract(u_2, 'string'): helloo" violates unique constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
 
 restart
 
@@ -190,4 +190,4 @@ restart
 statement error
 INSERT INTO tbl VALUES ('sunshine', 'love', 85, true);
 ----
-Constraint Error: Duplicate key "union_extract(u_2, 'string'): sunshine, union_extract(u_1, 'string'): love" violates unique constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (docs - sql - indexes).
\ No newline at end of file
+Constraint Error: Duplicate key "union_extract(u_2, 'string'): sunshine, union_extract(u_1, 'string'): love" violates unique constraint. If this is an unexpected constraint violation please double check with the known index limitations section in our documentation (https://duckdb.org/docs/sql/indexes).
\ No newline at end of file
diff --git a/test/sql/optimizer/expression/test_date_subtract_filter.test b/test/sql/optimizer/expression/test_date_subtract_filter.test
new file mode 100644
index 000000000000..1a28e412af84
--- /dev/null
+++ b/test/sql/optimizer/expression/test_date_subtract_filter.test
@@ -0,0 +1,20 @@
+# name: test/sql/optimizer/expression/test_date_subtract_filter.test
+# description: Issue #9863 - query involving a subtraction between dates and a comparison
+# group: [expression]
+
+statement ok
+PRAGMA enable_verification
+
+statement ok
+CREATE TABLE dates(lo_commitdate DATE);
+
+statement ok
+INSERT INTO dates VALUES (DATE '1992-02-10');
+
+query I
+SELECT CAST('2020-02-20' AS date) - CAST(min("ta_1"."lo_commitdate") AS date) AS "ca_1"
+FROM dates AS "ta_1"
+HAVING CAST('2020-02-20' AS date) - CAST(min("ta_1"."lo_commitdate") AS date) > 4
+ORDER BY "ca_1" ASC;
+----
+10237
diff --git a/test/sql/storage/types/test_uhugeint_storage.test b/test/sql/storage/types/test_uhugeint_storage.test
index 767e63dfb357..37098c11ca15 100644
--- a/test/sql/storage/types/test_uhugeint_storage.test
+++ b/test/sql/storage/types/test_uhugeint_storage.test
@@ -7,10 +7,10 @@ load __TEST_DIR__/uhugeint_storage_test.db
 
 # create a table with uhugeints
 statement ok
-CREATE TABLE uhugeints (h HUGEINT);
+CREATE TABLE uhugeints (h UHUGEINT);
 
 statement ok
-INSERT INTO uhugeints VALUES (1043178439874412422424), (42), (NULL), (47289478944894789472897441242);
+INSERT INTO uhugeints VALUES (0), (42), (NULL), ('340282366920938463463374607431768211455'::UHUGEINT);
 
 # reload the database from disk a few times, and check that the data is still there
 loop i 0 2
@@ -20,10 +20,10 @@ restart
 query I
 SELECT * FROM uhugeints
 ----
-1043178439874412422424
+0
 42
 NULL
-47289478944894789472897441242
+340282366920938463463374607431768211455
 
 query I
 SELECT * FROM uhugeints WHERE h = 42
@@ -33,5 +33,6 @@ SELECT * FROM uhugeints WHERE h = 42
 query I
 SELECT h FROM uhugeints WHERE h < 10 ORDER BY 1;
 ----
+0
 
 endloop
diff --git a/test/sql/types/numeric/uhugeint_try_cast.test b/test/sql/types/numeric/uhugeint_try_cast.test
index 4c86adbc099b..1e0d965a8087 100644
--- a/test/sql/types/numeric/uhugeint_try_cast.test
+++ b/test/sql/types/numeric/uhugeint_try_cast.test
@@ -12,15 +12,23 @@ CREATE TABLE uhugeints AS SELECT i::UHUGEINT i FROM (VALUES (0::UHUGEINT), (1::U
 # -> signed
 statement error
 SELECT i::TINYINT FROM uhugeints
+----
+Conversion Error
 
 statement error
 SELECT i::SMALLINT FROM uhugeints
+----
+Conversion Error
 
 statement error
 SELECT i::INTEGER FROM uhugeints
+----
+Conversion Error
 
 statement error
 SELECT i::BIGINT FROM uhugeints
+----
+Conversion Error
 
 query I
 SELECT TRY_CAST(i AS TINYINT) FROM uhugeints ORDER BY i
@@ -53,6 +61,8 @@ NULL
 # -> unsigned
 statement error
 SELECT i::UTINYINT FROM uhugeints ORDER BY i
+----
+Conversion Error
 
 query I
 SELECT TRY_CAST(i AS UTINYINT) FROM uhugeints ORDER BY i
@@ -63,6 +73,8 @@ NULL
 
 statement error
 SELECT i::USMALLINT FROM uhugeints ORDER BY i
+----
+Conversion Error
 
 query I
 SELECT TRY_CAST(i AS USMALLINT) FROM uhugeints ORDER BY i
@@ -73,6 +85,8 @@ NULL
 
 statement error
 SELECT i::UINTEGER FROM uhugeints ORDER BY i
+----
+Conversion Error
 
 query I
 SELECT TRY_CAST(i AS UINTEGER) FROM uhugeints ORDER BY i
@@ -83,6 +97,8 @@ NULL
 
 statement error
 SELECT i::UBIGINT FROM uhugeints ORDER BY i
+----
+Conversion Error
 
 query I
 SELECT TRY_CAST(i AS UBIGINT) FROM uhugeints ORDER BY i
@@ -128,6 +144,8 @@ CREATE TABLE strings AS SELECT * FROM (VALUES ('   '), ('blablabla'), ('-1000000
 
 statement error
 SELECT s::UHUGEINT FROM strings
+----
+Conversion Error
 
 query I
 SELECT TRY_CAST(s AS UHUGEINT) FROM strings
@@ -143,15 +161,23 @@ NULL
 # -> decimal casts
 statement error
 SELECT i::DECIMAL(3,0)::UHUGEINT FROM uhugeints ORDER BY i
+----
+Conversion Error
 
 statement error
 SELECT i::DECIMAL(9,0)::UHUGEINT FROM uhugeints ORDER BY i
+----
+Conversion Error
 
 statement error
 SELECT i::DECIMAL(18,0)::UHUGEINT FROM uhugeints ORDER BY i
+----
+Conversion Error
 
 statement error
 SELECT i::DECIMAL(38,0)::UHUGEINT FROM uhugeints ORDER BY i
+----
+Conversion Error
 
 query I
 SELECT TRY_CAST(i AS DECIMAL(3,0))::UHUGEINT FROM uhugeints ORDER BY i
diff --git a/test/sql/types/uhugeint/test_uhugeint_exponent.test b/test/sql/types/uhugeint/test_uhugeint_exponent.test
index 9f22c473db1f..80df8c058808 100644
--- a/test/sql/types/uhugeint/test_uhugeint_exponent.test
+++ b/test/sql/types/uhugeint/test_uhugeint_exponent.test
@@ -28,10 +28,21 @@ select (0.00000000000000000000002e+44)::UHUGEINT;
 # overflow
 statement error
 select '340282366920938463463374607431768211456e0'::UHUGEINT
+----
+Conversion Error
 
 statement error
-select '1.7e39'::UHUGEINT
+select '3.4e39'::UHUGEINT
+----
+Conversion Error
+
+query I
+select '3.4e38'::UHUGEINT
+----
+340000000000000000000000000000000000000
 
 statement error
-select '4e38'::UHUGEINT
+select '3.5e38'::UHUGEINT
+----
+Conversion Error
 
diff --git a/test/sql/upsert/test_big_insert.test b/test/sql/upsert/test_big_insert.test
index 3c08126b95e5..2de05a7d27b1 100644
--- a/test/sql/upsert/test_big_insert.test
+++ b/test/sql/upsert/test_big_insert.test
@@ -44,7 +44,7 @@ SELECT COUNT(*) FILTER (WHERE j = 10) FROM integers
 statement error
 INSERT INTO integers(i,j) select i%5,i from range(5000) tbl(i) on conflict do update set j = excluded.j, k = excluded.i;
 ----
-Invalid Input Error: ON CONFLICT DO UPDATE can not update the same row twice in the same command, Ensure that no rows proposed for insertion within the same command have duplicate constrained values
+Invalid Input Error: ON CONFLICT DO UPDATE can not update the same row twice in the same command. Ensure that no rows proposed for insertion within the same command have duplicate constrained values
 
 statement ok
 INSERT INTO integers(i,j) select i%5,i from range(4995, 5000) tbl(i) on conflict do update set j = excluded.j, k = excluded.i;
diff --git a/test/sql/upsert/upsert_basic.test b/test/sql/upsert/upsert_basic.test
index 76bac498c27c..363457ae09d4 100644
--- a/test/sql/upsert/upsert_basic.test
+++ b/test/sql/upsert/upsert_basic.test
@@ -79,7 +79,7 @@ insert into tbl VALUES
 ON CONFLICT (i) DO UPDATE SET
 	k = excluded.k;
 ----
-Invalid Input Error: ON CONFLICT DO UPDATE can not update the same row twice in the same command, Ensure that no rows proposed for insertion within the same command have duplicate constrained values
+Invalid Input Error: ON CONFLICT DO UPDATE can not update the same row twice in the same command. Ensure that no rows proposed for insertion within the same command have duplicate constrained values
 
 # Since the query errored, no operation is performed
 query III
diff --git a/test/sql/upsert/upsert_transaction.test b/test/sql/upsert/upsert_transaction.test
index a5e8ae3da477..ed499250d002 100644
--- a/test/sql/upsert/upsert_transaction.test
+++ b/test/sql/upsert/upsert_transaction.test
@@ -67,7 +67,7 @@ insert into tbl VALUES
 ON CONFLICT (a) DO UPDATE SET
 	b = excluded.b;
 ----
-ON CONFLICT DO UPDATE can not update the same row twice in the same command, Ensure that no rows proposed for insertion within the same command have duplicate constrained values
+ON CONFLICT DO UPDATE can not update the same row twice in the same command. Ensure that no rows proposed for insertion within the same command have duplicate constrained values
 
 statement ok
 COMMIT;
diff --git a/tools/pythonpkg/scripts/cache_data.json b/tools/pythonpkg/scripts/cache_data.json
index 8b377efa0c39..ca9c7a88c4ab 100644
--- a/tools/pythonpkg/scripts/cache_data.json
+++ b/tools/pythonpkg/scripts/cache_data.json
@@ -48,9 +48,10 @@
         "name": "pandas",
         "children": [
             "pandas.DataFrame",
-            "pandas._libs",
             "pandas.isnull",
-            "pandas.ArrowDtype"
+            "pandas.ArrowDtype",
+            "pandas.NaT",
+            "pandas.NA"
         ],
         "required": false
     },
@@ -60,27 +61,16 @@
         "name": "DataFrame",
         "children": []
     },
-    "pandas._libs": {
+    "pandas.NaT": {
         "type": "attribute",
-        "full_path": "pandas._libs",
-        "name": "_libs",
-        "children": [
-            "pandas._libs.missing"
-        ],
-        "required": false
-    },
-    "pandas._libs.missing": {
-        "type": "attribute",
-        "full_path": "pandas._libs.missing",
-        "name": "missing",
-        "children": [
-            "pandas._libs.missing.NAType"
-        ]
+        "full_path": "pandas.NaT",
+        "name": "NaT",
+        "children": []
     },
-    "pandas._libs.missing.NAType": {
+    "pandas.NA": {
         "type": "attribute",
-        "full_path": "pandas._libs.missing.NAType",
-        "name": "NAType",
+        "full_path": "pandas.NA",
+        "name": "NA",
         "children": []
     },
     "pandas.isnull": {
@@ -433,7 +423,7 @@
         "children": [
             "duckdb.filesystem.ModifiedMemoryFileSystem"
         ],
-		"required": false
+        "required": false
     },
     "duckdb.filesystem.ModifiedMemoryFileSystem": {
         "type": "attribute",
diff --git a/tools/pythonpkg/scripts/imports.py b/tools/pythonpkg/scripts/imports.py
index a09fbf7734ce..8d868cb94295 100644
--- a/tools/pythonpkg/scripts/imports.py
+++ b/tools/pythonpkg/scripts/imports.py
@@ -9,7 +9,8 @@
 import pandas
 
 pandas.DataFrame
-pandas._libs.missing.NAType
+pandas.NaT
+pandas.NA
 pandas.isnull
 pandas.ArrowDtype
 
diff --git a/tools/pythonpkg/src/include/duckdb_python/import_cache/modules/pandas_module.hpp b/tools/pythonpkg/src/include/duckdb_python/import_cache/modules/pandas_module.hpp
index 6ea660689128..30c36f691233 100644
--- a/tools/pythonpkg/src/include/duckdb_python/import_cache/modules/pandas_module.hpp
+++ b/tools/pythonpkg/src/include/duckdb_python/import_cache/modules/pandas_module.hpp
@@ -13,35 +13,6 @@
 
 namespace duckdb {
 
-struct PandasLibsMissingCacheItem : public PythonImportCacheItem {
-
-public:
-	PandasLibsMissingCacheItem(optional_ptr<PythonImportCacheItem> parent)
-	    : PythonImportCacheItem("missing", parent), NAType("NAType", this) {
-	}
-	~PandasLibsMissingCacheItem() override {
-	}
-
-	PythonImportCacheItem NAType;
-};
-
-struct PandasLibsCacheItem : public PythonImportCacheItem {
-
-public:
-	PandasLibsCacheItem(optional_ptr<PythonImportCacheItem> parent)
-	    : PythonImportCacheItem("_libs", parent), missing(this) {
-	}
-	~PandasLibsCacheItem() override {
-	}
-
-	PandasLibsMissingCacheItem missing;
-
-protected:
-	bool IsRequired() const override final {
-		return false;
-	}
-};
-
 struct PandasCacheItem : public PythonImportCacheItem {
 
 public:
@@ -49,16 +20,17 @@ struct PandasCacheItem : public PythonImportCacheItem {
 
 public:
 	PandasCacheItem()
-	    : PythonImportCacheItem("pandas"), DataFrame("DataFrame", this), _libs(this), isnull("isnull", this),
-	      ArrowDtype("ArrowDtype", this) {
+	    : PythonImportCacheItem("pandas"), DataFrame("DataFrame", this), isnull("isnull", this),
+	      ArrowDtype("ArrowDtype", this), NaT("NaT", this), NA("NA", this) {
 	}
 	~PandasCacheItem() override {
 	}
 
 	PythonImportCacheItem DataFrame;
-	PandasLibsCacheItem _libs;
 	PythonImportCacheItem isnull;
 	PythonImportCacheItem ArrowDtype;
+	PythonImportCacheItem NaT;
+	PythonImportCacheItem NA;
 
 protected:
 	bool IsRequired() const override final {
diff --git a/tools/pythonpkg/src/include/duckdb_python/python_objects.hpp b/tools/pythonpkg/src/include/duckdb_python/python_objects.hpp
index cda87259789c..5ef4a4bb4cb7 100644
--- a/tools/pythonpkg/src/include/duckdb_python/python_objects.hpp
+++ b/tools/pythonpkg/src/include/duckdb_python/python_objects.hpp
@@ -163,8 +163,6 @@ struct PyDateTime {
 	date_t ToDate();
 	dtime_t ToDuckTime();
 	Value ToDuckValue(const LogicalType &target_type);
-	bool IsPositiveInfinity() const;
-	bool IsNegativeInfinity() const;
 
 public:
 	static int32_t GetYears(py::handle &obj);
@@ -186,8 +184,6 @@ struct PyDate {
 
 public:
 	Value ToDuckValue();
-	bool IsPositiveInfinity() const;
-	bool IsNegativeInfinity() const;
 };
 
 struct PyTimezone {
diff --git a/tools/pythonpkg/src/native/python_conversion.cpp b/tools/pythonpkg/src/native/python_conversion.cpp
index 53504df4f550..2ae13cde8ac5 100644
--- a/tools/pythonpkg/src/native/python_conversion.cpp
+++ b/tools/pythonpkg/src/native/python_conversion.cpp
@@ -370,7 +370,9 @@ PythonObjectType GetPythonObjectType(py::handle &ele) {
 
 	if (ele.is_none()) {
 		return PythonObjectType::None;
-	} else if (py::isinstance(ele, import_cache.pandas._libs.missing.NAType())) {
+	} else if (ele.is(import_cache.pandas.NaT())) {
+		return PythonObjectType::None;
+	} else if (ele.is(import_cache.pandas.NA())) {
 		return PythonObjectType::None;
 	} else if (py::isinstance<py::bool_>(ele)) {
 		return PythonObjectType::Bool;
diff --git a/tools/pythonpkg/src/native/python_objects.cpp b/tools/pythonpkg/src/native/python_objects.cpp
index 5e970f4a98ab..80c45cac5d8b 100644
--- a/tools/pythonpkg/src/native/python_objects.cpp
+++ b/tools/pythonpkg/src/native/python_objects.cpp
@@ -274,23 +274,7 @@ timestamp_t PyDateTime::ToTimestamp() {
 	return Timestamp::FromDatetime(date, time);
 }
 
-bool PyDateTime::IsPositiveInfinity() const {
-	return year == 9999 && month == 12 && day == 31 && hour == 23 && minute == 59 && second == 59 && micros == 999999;
-}
-
-bool PyDateTime::IsNegativeInfinity() const {
-	return year == 1 && month == 1 && day == 1 && hour == 0 && minute == 0 && second == 0 && micros == 0;
-}
-
 Value PyDateTime::ToDuckValue(const LogicalType &target_type) {
-	if (IsPositiveInfinity()) {
-		// FIXME: respect the target_type ?
-		return Value::TIMESTAMP(timestamp_t::infinity());
-	}
-	if (IsNegativeInfinity()) {
-		// FIXME: respect the target_type ?
-		return Value::TIMESTAMP(timestamp_t::ninfinity());
-	}
 	auto timestamp = ToTimestamp();
 	if (!py::none().is(tzone_obj)) {
 		auto utc_offset = PyTimezone::GetUTCOffset(tzone_obj);
@@ -363,21 +347,8 @@ PyDate::PyDate(py::handle &ele) {
 }
 
 Value PyDate::ToDuckValue() {
-	if (IsPositiveInfinity()) {
-		return Value::DATE(date_t::infinity());
-	}
-	if (IsNegativeInfinity()) {
-		return Value::DATE(date_t::ninfinity());
-	}
-	return Value::DATE(year, month, day);
-}
-
-bool PyDate::IsPositiveInfinity() const {
-	return year == 9999 && month == 12 && day == 31;
-}
-
-bool PyDate::IsNegativeInfinity() const {
-	return year == 1 && month == 1 && day == 1;
+	auto value = Value::DATE(year, month, day);
+	return value;
 }
 
 void PythonObject::Initialize() {
diff --git a/tools/pythonpkg/src/numpy/numpy_scan.cpp b/tools/pythonpkg/src/numpy/numpy_scan.cpp
index 4e2bdc9c9aa4..e74540318844 100644
--- a/tools/pythonpkg/src/numpy/numpy_scan.cpp
+++ b/tools/pythonpkg/src/numpy/numpy_scan.cpp
@@ -340,11 +340,18 @@ void NumpyScan::Scan(PandasColumnBindData &bind_data, idx_t count, idx_t offset,
 					out_mask.SetInvalid(row);
 					continue;
 				}
-				if (import_cache.pandas._libs.missing.NAType(false)) {
-					// If pandas is imported, check if the type is NAType
-					auto val_type = Py_TYPE(val);
-					auto na_type = reinterpret_cast<PyTypeObject *>(import_cache.pandas._libs.missing.NAType().ptr());
-					if (val_type == na_type) {
+				if (import_cache.pandas.NaT(false)) {
+					// If pandas is imported, check if this is pandas.NaT
+					py::handle value(val);
+					if (value.is(import_cache.pandas.NaT())) {
+						out_mask.SetInvalid(row);
+						continue;
+					}
+				}
+				if (import_cache.pandas.NA(false)) {
+					// If pandas is imported, check if this is pandas.NA
+					py::handle value(val);
+					if (value.is(import_cache.pandas.NA())) {
 						out_mask.SetInvalid(row);
 						continue;
 					}
diff --git a/tools/pythonpkg/tests/fast/pandas/test_df_object_resolution.py b/tools/pythonpkg/tests/fast/pandas/test_df_object_resolution.py
index 88e43c2cb0d6..b7b40f178b02 100644
--- a/tools/pythonpkg/tests/fast/pandas/test_df_object_resolution.py
+++ b/tools/pythonpkg/tests/fast/pandas/test_df_object_resolution.py
@@ -573,42 +573,67 @@ def test_multiple_chunks(self, pandas):
         assert len(res['dates'].__array__()) == 4
 
     @pytest.mark.parametrize('pandas', [NumpyPandas(), ArrowPandas()])
-    def test_multiple_chunks_aggregate(self, pandas):
-        conn = duckdb.connect()
-        conn.execute(
-            "create table dates as select '2022-09-14'::DATE + INTERVAL (i::INTEGER) DAY as i from range(0, 4096) tbl(i);"
+    def test_multiple_chunks_aggregate(self, pandas, duckdb_cursor):
+        duckdb_cursor.execute(f"SET GLOBAL pandas_analyze_sample=4096")
+        duckdb_cursor.execute(
+            "create table dates as select '2022-09-14'::DATE + INTERVAL (i::INTEGER) DAY as i from range(4096) tbl(i);"
         )
-        res = duckdb.query("select * from dates", connection=conn).df()
+        rel = duckdb_cursor.query("select * from dates")
+        res = rel.df()
         date_df = res.copy()
-        # Convert the values to `datetime.date` values, and the dtype of the column to 'object'
+
+        # Convert the dataframe to datetime
         date_df['i'] = pandas.to_datetime(res['i']).dt.date
         assert str(date_df['i'].dtype) == 'object'
-        expected_res = duckdb.query(
-            'select avg(epoch(i)), min(epoch(i)), max(epoch(i)) from dates;', connection=conn
-        ).fetchall()
-        actual_res = duckdb.query_df(
-            date_df, 'x', 'select avg(epoch(i)), min(epoch(i)), max(epoch(i)) from x'
-        ).fetchall()
+
+        expected_res = [
+            (
+                1840017600.0,  # Saturday, April 22, 2028 12:00:00 PM (avg)
+                1663113600.0,  # Wednesday, September 14, 2022 12:00:00 AM (min)
+                2016921600.0,  # Wednesday, November 30, 2033 12:00:00 AM (max)
+            )
+        ]
+
+        rel = duckdb_cursor.query(
+            """
+            select
+                avg(epoch(i)),
+                min(epoch(i)),
+                max(epoch(i))
+            from date_df
+        """
+        )
+        actual_res = rel.fetchall()
         assert expected_res == actual_res
 
-        conn.execute('drop table dates')
-        # Now with nulls interleaved
+        # Now interleave nulls into the dataframe
+        duckdb_cursor.execute('drop table dates')
         for i in range(0, len(res['i']), 2):
             res['i'][i] = None
+        duckdb_cursor.execute('create table dates as select * from res')
 
-        date_view = conn.register("date_view", res)
-        date_view.execute('create table dates as select * from date_view')
-        expected_res = duckdb.query(
-            "select avg(epoch(i)), min(epoch(i)), max(epoch(i)) from dates", connection=conn
-        ).fetchall()
-
+        expected_res = [
+            (
+                1840060800.0,  # Sunday, April 23, 2028 12:00:00 AM
+                1663200000.0,  # Thursday, September 15, 2022 12:00:00 AM
+                2016921600.0,  # Wednesday, November 30, 2033 12:00:00 AM
+            )
+        ]
+        # Convert the dataframe to datetime
         date_df = res.copy()
-        # Convert the values to `datetime.date` values, and the dtype of the column to 'object'
         date_df['i'] = pandas.to_datetime(res['i']).dt.date
         assert str(date_df['i'].dtype) == 'object'
-        actual_res = duckdb.query_df(
-            date_df, 'x', 'select avg(epoch(i)), min(epoch(i)), max(epoch(i)) from x'
+
+        actual_res = duckdb_cursor.query(
+            """
+            select
+                avg(epoch(i)),
+                min(epoch(i)),
+                max(epoch(i))
+            from date_df
+        """
         ).fetchall()
+
         assert expected_res == actual_res
 
     @pytest.mark.parametrize('pandas', [NumpyPandas(), ArrowPandas()])
diff --git a/tools/pythonpkg/tests/fast/pandas/test_pandas_na.py b/tools/pythonpkg/tests/fast/pandas/test_pandas_na.py
index f76fd98077dd..fb102f9bd1a0 100644
--- a/tools/pythonpkg/tests/fast/pandas/test_pandas_na.py
+++ b/tools/pythonpkg/tests/fast/pandas/test_pandas_na.py
@@ -18,15 +18,13 @@ def test_pandas_na(self, duckdb_cursor):
         # DataFrame containing a single pd.NA
         df = pd.DataFrame(pd.Series([pd.NA]))
 
-        conn = duckdb.connect()
-
-        res = conn.execute("select * from df").fetchall()
+        res = duckdb_cursor.execute("select * from df").fetchall()
         assert res[0][0] == None
 
         # DataFrame containing multiple values, with a pd.NA mixed in
         null_index = 3
         df = pd.DataFrame(pd.Series([3, 1, 2, pd.NA, 8, 6]))
-        res = conn.execute("select * from df").fetchall()
+        res = duckdb_cursor.execute("select * from df").fetchall()
         items = [x[0] for x in [y for y in res]]
         assert_nullness(items, [null_index])
 
@@ -62,13 +60,13 @@ def test_pandas_na(self, duckdb_cursor):
         assert str(nan_df['a'].dtype) == 'float64'
         assert str(na_df['a'].dtype) == 'object'  # pd.NA values turn the column into 'object'
 
-        nan_result = conn.execute("select * from nan_df").df()
-        na_result = conn.execute("select * from na_df").df()
+        nan_result = duckdb_cursor.execute("select * from nan_df").df()
+        na_result = duckdb_cursor.execute("select * from na_df").df()
         pd.testing.assert_frame_equal(nan_result, na_result)
 
         # Mixed with stringified pd.NA values
         na_string_df = pd.DataFrame({'a': [str(pd.NA), str(pd.NA), pd.NA, str(pd.NA), pd.NA, pd.NA, pd.NA, str(pd.NA)]})
         null_indices = [2, 4, 5, 6]
-        res = conn.execute("select * from na_string_df").fetchall()
+        res = duckdb_cursor.execute("select * from na_string_df").fetchall()
         items = [x[0] for x in [y for y in res]]
         assert_nullness(items, null_indices)
diff --git a/tools/pythonpkg/tests/fast/types/test_datetime_date.py b/tools/pythonpkg/tests/fast/types/test_datetime_date.py
index 83973be40224..9efb6bd1ee8f 100644
--- a/tools/pythonpkg/tests/fast/types/test_datetime_date.py
+++ b/tools/pythonpkg/tests/fast/types/test_datetime_date.py
@@ -22,9 +22,9 @@ def test_date_infinity_roundtrip(self):
         # positive infinity
         con.execute("select $1, $1 = 'infinity'::DATE", [datetime.date.max])
         res = con.fetchall()
-        assert res == [(datetime.date.max, True)]
+        assert res == [(datetime.date.max, False)]
 
         # negative infinity
         con.execute("select $1, $1 = '-infinity'::DATE", [datetime.date.min])
         res = con.fetchall()
-        assert res == [(datetime.date.min, True)]
+        assert res == [(datetime.date.min, False)]
diff --git a/tools/pythonpkg/tests/fast/types/test_datetime_datetime.py b/tools/pythonpkg/tests/fast/types/test_datetime_datetime.py
index 45aff1fca0fe..cfd307cb9f73 100644
--- a/tools/pythonpkg/tests/fast/types/test_datetime_datetime.py
+++ b/tools/pythonpkg/tests/fast/types/test_datetime_datetime.py
@@ -41,9 +41,9 @@ def test_timestamp_infinity_roundtrip(self):
         # positive infinity
         con.execute("select $1, $1 = 'infinity'::TIMESTAMP", [datetime.datetime.max])
         res = con.fetchall()
-        assert res == [(datetime.datetime.max, True)]
+        assert res == [(datetime.datetime.max, False)]
 
         # negative infinity
         con.execute("select $1, $1 = '-infinity'::TIMESTAMP", [datetime.datetime.min])
         res = con.fetchall()
-        assert res == [(datetime.datetime.min, True)]
+        assert res == [(datetime.datetime.min, False)]
diff --git a/tools/shell/shell.c b/tools/shell/shell.c
index 5c802935cf2b..a57809c35ac9 100644
--- a/tools/shell/shell.c
+++ b/tools/shell/shell.c
@@ -11617,18 +11617,21 @@ static int shell_callback(
       if (nArg != 2) {
         break;
       }
-      utf8_printf(p->out, "\n┌─────────────────────────────┐\n");
-      utf8_printf(p->out, "│┌───────────────────────────┐│\n");
-      if (strcmp(azArg[0], "logical_plan") == 0) {
-      utf8_printf(p->out, "││ Unoptimized Logical Plan  ││\n");
-      } else if (strcmp(azArg[0], "logical_opt") == 0) {
-      utf8_printf(p->out, "││  Optimized Logical Plan   ││\n");
-      } else if (strcmp(azArg[0], "physical_plan") == 0) {
-      utf8_printf(p->out, "││       Physical Plan       ││\n");
-
-      }
-      utf8_printf(p->out, "│└───────────────────────────┘│\n");
-      utf8_printf(p->out, "└─────────────────────────────┘\n");
+      if (strcmp(azArg[0], "logical_plan") == 0
+            || strcmp(azArg[0], "logical_opt") == 0
+            || strcmp(azArg[0], "physical_plan") == 0) { 
+        utf8_printf(p->out, "\n┌─────────────────────────────┐\n");
+        utf8_printf(p->out, "│┌───────────────────────────┐│\n");
+        if (strcmp(azArg[0], "logical_plan") == 0) {
+          utf8_printf(p->out, "││ Unoptimized Logical Plan  ││\n");
+        } else if (strcmp(azArg[0], "logical_opt") == 0) {
+          utf8_printf(p->out, "││  Optimized Logical Plan   ││\n");
+        } else if (strcmp(azArg[0], "physical_plan") == 0) {
+          utf8_printf(p->out, "││       Physical Plan       ││\n");
+        }
+        utf8_printf(p->out, "│└───────────────────────────┘│\n");
+        utf8_printf(p->out, "└─────────────────────────────┘\n");
+      }
       utf8_printf(p->out, "%s", azArg[1]);
       break;
     }
diff --git a/tools/shell/tests/test_autocomplete.py b/tools/shell/tests/test_autocomplete.py
index cb7bfc7cf4f5..fd068ecb1177 100644
--- a/tools/shell/tests/test_autocomplete.py
+++ b/tools/shell/tests/test_autocomplete.py
@@ -17,6 +17,14 @@ def test_autocomplete_select(shell, autocomplete_extension):
     result = test.run()
     result.check_stdout('SELECT')
 
+def test_autocomplete_first_from(shell, autocomplete_extension):
+    test = (
+        ShellTest(shell)
+        .statement("CALL sql_auto_complete('FRO')")
+    )
+    result = test.run()
+    result.check_stdout('FROM')
+
 def test_autocomplete_column(shell, autocomplete_extension):
     test = (
         ShellTest(shell)