diff --git a/buildscripts/build_rcac_gnu.sh b/buildscripts/build_rcac_gnu.sh
index a41e60266..82f8cf68b 100755
--- a/buildscripts/build_rcac_gnu.sh
+++ b/buildscripts/build_rcac_gnu.sh
@@ -80,7 +80,6 @@ if [[ BUILD_TYPE == "Release" ]]; then
             --no-build-isolation \
             -ve . 
 else
-    pip uninstall swiftest -y
     cmake -P distclean.cmake
     cmake -B ${ROOT_DIR}/build -S . -G Ninja \
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
diff --git a/buildscripts/build_rcac_intel.sh b/buildscripts/build_rcac_intel.sh
index 57433581f..58919182f 100755
--- a/buildscripts/build_rcac_intel.sh
+++ b/buildscripts/build_rcac_intel.sh
@@ -51,7 +51,6 @@ if [[ $MACHINE_NAME == "bell" ]]; then
     module load netcdf/4.7.4
     module load netcdf-fortran/4.5.3
     module load use.own
-    # module load fftw/3.3.8.lua 
     module load conda-env/mintongroup-py3.8.5
     MACHINE_CODE_VALUE="Host"
 elif [[ $MACHINE_NAME == "negishi" ]]; then
diff --git a/cmake/Modules/FindFFTW3.cmake b/cmake/Modules/FindFFTW3.cmake
index ce3bd0dcb..e41405eab 100644
--- a/cmake/Modules/FindFFTW3.cmake
+++ b/cmake/Modules/FindFFTW3.cmake
@@ -9,8 +9,8 @@
 
 # - Finds the FFTW3 library
 MESSAGE(STATUS "Looking for FFTW3")
-FIND_PATH(FFTW3_INCLUDE_DIR NAMES fftw3.h HINTS ENV FFTW3_HOME PATH_SUFFIXES include)
-FIND_LIBRARY(FFTW3_LIBRARY NAMES libfftw3.a HINTS ENV FFTW3_HOME PATH_SUFFIXES lib)
+FIND_PATH(FFTW3_INCLUDE_DIR NAMES fftw3.h HINTS ENV FFTW3_HOME FFTW_HOME PATH_SUFFIXES include)
+FIND_LIBRARY(FFTW3_LIBRARY NAMES libfftw3.a HINTS ENV FFTW3_HOME FFTW_HOME PATH_SUFFIXES lib)
 
 IF(NOT FFTW3_INCLUDE_DIR OR NOT FFTW3_LIBRARY)
    MESSAGE(STATUS "FFTW3 not found")
diff --git a/swiftest/CMakeLists.txt b/swiftest/CMakeLists.txt
index 39a52ddea..1d6db80b2 100644
--- a/swiftest/CMakeLists.txt
+++ b/swiftest/CMakeLists.txt
@@ -17,27 +17,31 @@ FIND_PROGRAM(CYTHON
             NO_CMAKE_SYSTEM_PATH
             NO_CMAKE_FIND_ROOT_PATH
             )
+IF (NOT CYTHON)
+   MESSAGE(STATUS "Cython not found. Skipping Cython build")
+   RETURN()
+ENDIF()
+
 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")
     LIST(APPEND CYTHON_ARGS "--gdb")
 endif ()
 ADD_CUSTOM_COMMAND(
-  OUTPUT "${SWIFTEST_BINDINGS}.c"
-  DEPENDS "${SWIFTEST_BINDINGS}.pyx"
-  VERBATIM
-  COMMAND "${CYTHON}" ${CYTHON_ARGS} )
+    OUTPUT "${SWIFTEST_BINDINGS}.c"
+    DEPENDS "${SWIFTEST_BINDINGS}.pyx"
+    VERBATIM
+    COMMAND "${CYTHON}" ${CYTHON_ARGS} )
 
 PYTHON_ADD_LIBRARY(${SWIFTEST_BINDINGS} MODULE "${CMAKE_CURRENT_BINARY_DIR}/${SWIFTEST_BINDINGS}.c" WITH_SOABI)
 
 TARGET_LINK_LIBRARIES(${SWIFTEST_BINDINGS} PUBLIC ${SWIFTEST_LIBRARY} netCDF::netcdff HDF5::HDF5)
 
 IF(USE_OPENMP OR USE_SIMD)
-  TARGET_LINK_LIBRARIES(${SWIFTEST_BINDINGS} PUBLIC SHTOOLS::parallel)
+    TARGET_LINK_LIBRARIES(${SWIFTEST_BINDINGS} PUBLIC SHTOOLS::parallel)
 ELSE()
-  TARGET_LINK_LIBRARIES(${SWIFTEST_BINDINGS} PUBLIC SHTOOLS::serial)
+    TARGET_LINK_LIBRARIES(${SWIFTEST_BINDINGS} PUBLIC SHTOOLS::serial)
 ENDIF ()
 
 TARGET_INCLUDE_DIRECTORIES(${SWIFTEST_BINDINGS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})