diff --git a/faiss/gpu/StandardGpuResources.cpp b/faiss/gpu/StandardGpuResources.cpp
index 4b35aa4c0a..2d4c675d64 100644
--- a/faiss/gpu/StandardGpuResources.cpp
+++ b/faiss/gpu/StandardGpuResources.cpp
@@ -432,6 +432,9 @@ raft::device_resources& StandardGpuResourcesImpl::getRaftHandle(int device) {
         // Make sure we are using the stream the user may have already assigned
         // to the current GpuResources
         raftHandles_.emplace(std::make_pair(device, getDefaultStream(device)));
+
+        // Initialize cublas handle
+        raftHandles_[device].get_cublas_handle();
     }
 
     // Otherwise, our base default handle
diff --git a/faiss/gpu/impl/RaftUtils.h b/faiss/gpu/impl/RaftUtils.h
index 6c744051ae..f1ea19ed33 100644
--- a/faiss/gpu/impl/RaftUtils.h
+++ b/faiss/gpu/impl/RaftUtils.h
@@ -36,8 +36,7 @@ inline raft::distance::DistanceType faiss_to_raft(
         case MetricType::METRIC_INNER_PRODUCT:
             return raft::distance::DistanceType::InnerProduct;
         case MetricType::METRIC_L2:
-            return exactDistance ? raft::distance::DistanceType::L2Unexpanded
-                                 : raft::distance::DistanceType::L2Expanded;
+            return raft::distance::DistanceType::L2Expanded;
         case MetricType::METRIC_L1:
             return raft::distance::DistanceType::L1;
         case MetricType::METRIC_Linf: