diff --git a/mcp/pom.xml b/mcp/pom.xml
index 77343282..f559712d 100644
--- a/mcp/pom.xml
+++ b/mcp/pom.xml
@@ -37,11 +37,11 @@
 								Bundle-Name:            Bundle ${project.groupId} : ${project.artifactId}
 								version:                ${versionmask;===;${version_cleanup;${project.version}}}
 								Bundle-SymbolicName:    ${project.groupId}.${project.artifactId}
-								Bundle-Version:         ${version}
+								Bundle-Version:         ${project.version}
 								Automatic-Module-Name:  ${project.groupId}.${project.artifactId}
 								Import-Package:         jakarta.*;resolution:=optional, \
 								                        *;
-								Export-Package:         io.modelcontextprotocol.*;version="${version}";-noimport:=true
+								Export-Package:         io.modelcontextprotocol.*;version="${project.version}";-noimport:=true
 								-noimportjava:          true;
 								-nouses:                true;
 								-removeheaders:         Private-Package
diff --git a/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java b/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
index 9d71cbb4..e74918da 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/client/transport/StdioClientTransport.java
@@ -344,15 +344,15 @@ public Mono<Void> closeGracefully() {
 		return Mono.fromRunnable(() -> {
 			isClosing = true;
 			logger.debug("Initiating graceful shutdown");
-		}).then(Mono.defer(() -> {
+		}).then(Mono.<Void>defer(() -> {
 			// First complete all sinks to stop accepting new messages
 			inboundSink.tryEmitComplete();
 			outboundSink.tryEmitComplete();
 			errorSink.tryEmitComplete();
 
 			// Give a short time for any pending messages to be processed
-			return Mono.delay(Duration.ofMillis(100));
-		})).then(Mono.defer(() -> {
+			return Mono.delay(Duration.ofMillis(100)).then();
+		})).then(Mono.<Process>defer(() -> {
 			logger.debug("Sending TERM to process");
 			if (this.process != null) {
 				this.process.destroy();