diff --git a/examples/SharedMemory/SharedMemoryPublic.h b/examples/SharedMemory/SharedMemoryPublic.h
index b2c2f6c68..6c62c788e 100644
--- a/examples/SharedMemory/SharedMemoryPublic.h
+++ b/examples/SharedMemory/SharedMemoryPublic.h
@@ -952,7 +952,7 @@ struct b3ForwardDynamicsAnalyticsIslandData
 	double m_remainingLeastSquaresResidual;
 };
 
-#define MAX_ISLANDS_ANALYTICS 1024
+#define MAX_ISLANDS_ANALYTICS 64
 
 struct b3ForwardDynamicsAnalyticsArgs
 {
diff --git a/examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp b/examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp
index eb6c04d9f..7a0d4888a 100644
--- a/examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp
+++ b/examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp
@@ -206,7 +206,9 @@ private:
 			{
 				GPR_ASSERT(status_ == FINISH);
 				// Once in the FINISH state, deallocate ourselves (CallData).
+				CallData tmpStatus = status_;
 				delete this;
+				return tmpStatus;
 			}
 			return status_;
 		}