diff --git a/src/swiftest/swiftest_drift.f90 b/src/swiftest/swiftest_drift.f90
index 0fdb0f63f..b03a3ef70 100644
--- a/src/swiftest/swiftest_drift.f90
+++ b/src/swiftest/swiftest_drift.f90
@@ -209,9 +209,9 @@ pure subroutine swiftest_drift_dan(mu, rx0, ry0, rz0, vx0, vy0, vz0, dt0, iflag)
 
       ! For debugging overflow error
 
-      if(r0 .ge. 11970204779.00) then
-         f = 1.0_DP
-      end if
+      ! if(r0 .ge. 11970204779.00) then
+      !    f = 1.0_DP
+      ! end if
 
       call swiftest_drift_kepu(dt, r0, mu, alpha, u, fp, c1, c2, c3, iflag)
       if (iflag == 0) then
@@ -467,11 +467,6 @@ pure subroutine swiftest_drift_kepu_new(s, dt, r0, mu, alpha, u, fp, c1, c2, c3,
       do nc = 0, 6
          x = s*s*alpha
 
-         ! for debugging overflow error
-         if (abs(x) .ge. HUGE(0.0_DP) .or. x < 0) then
-            f = 1.0_DP ! "big x"
-         end if 
-
          call swiftest_drift_kepu_stumpff(x, c0, c1, c2, c3)
          c1 = c1*s
          c2 = c2*s*s
@@ -564,12 +559,6 @@ pure subroutine swiftest_drift_kepu_stumpff(x, c0, c1, c2, c3)
       ! Internals
       integer(I4B) :: i, n
       real(DP)   :: xm
-
-      ! for debugging overflow error
-      if (abs(x) .ge. HUGE(0.0_DP) .or. x < 0) then
-         x = x ! "big x"
-         n = 0
-      end if
       
       n = 0
       xm = 0.1_DP
@@ -595,23 +584,23 @@ pure subroutine swiftest_drift_kepu_stumpff(x, c0, c1, c2, c3)
          end do
       end if
 
-      ! for debugging Floating overflow error
+      ! ! for debugging Floating overflow error
 
-      if (abs(c0) .ge. HUGE(0.0_DP)) then
-         xm = 0.1_DP ! "big c0"
-      end if
+      ! if (abs(c0) .ge. HUGE(0.0_DP)) then
+      !    xm = 0.1_DP ! "big c0"
+      ! end if
 
-      if (abs(c1) .ge. HUGE(0.0_DP)) then
-         xm = 0.1_DP ! "big c1"
-      end if
+      ! if (abs(c1) .ge. HUGE(0.0_DP)) then
+      !    xm = 0.1_DP ! "big c1"
+      ! end if
 
-      if (abs(c2) .ge. HUGE(0.0_DP)) then
-         xm = 0.1_DP ! "big c2"
-      end if
+      ! if (abs(c2) .ge. HUGE(0.0_DP)) then
+      !    xm = 0.1_DP ! "big c2"
+      ! end if
 
-      if (abs(c3) .ge. HUGE(0.0_DP)) then
-         xm = 0.1_DP ! "big c3"
-      end if
+      ! if (abs(c3) .ge. HUGE(0.0_DP)) then
+      !    xm = 0.1_DP ! "big c3"
+      ! end if
 
 
       return
diff --git a/swiftest/CMakeLists.txt b/swiftest/CMakeLists.txt
index 2a53718f2..ae6ef5247 100644
--- a/swiftest/CMakeLists.txt
+++ b/swiftest/CMakeLists.txt
@@ -18,6 +18,7 @@ FIND_PROGRAM(CYTHON
             NO_CMAKE_FIND_ROOT_PATH
             )
 MESSAGE(STATUS "Cython executable path: ${CYTHON}")
+# MESSAGE(STATUS "LD_LIBRARY_PATH: $ENV{LD_LIBRARY_PATH}")
 SET(CYTHON_ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${SWIFTEST_BINDINGS}.pyx" "--output-file" "${CMAKE_CURRENT_BINARY_DIR}/${SWIFTEST_BINDINGS}.c")
 STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BT)
 IF (BT STREQUAL "DEBUG")