diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86db431..c526ec4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.cmake)
 include(CheckLanguage)
 check_language(CUDA)
 if(CMAKE_CUDA_COMPILER)
+    set(CMAKE_CUDA_STANDARD 11)
+    set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
     enable_language(CUDA)
     find_package(CUDAToolkit) # TODO added in cmake 3.17 - copy this module
 endif()
diff --git a/contrib/PyCuAmpcor/CMakeLists.txt b/contrib/PyCuAmpcor/CMakeLists.txt
index 93a08ad..f6414e1 100644
--- a/contrib/PyCuAmpcor/CMakeLists.txt
+++ b/contrib/PyCuAmpcor/CMakeLists.txt
@@ -1,7 +1,9 @@
 # Early exit if prereqs not available
-if(NOT CMAKE_CUDA_COMPILER OR
-   NOT TARGET GDAL::GDAL OR
-   NOT TARGET Python::NumPy)
+if(NOT TARGET GDAL::GDAL
+OR NOT TARGET Python::NumPy
+OR NOT TARGET CUDA::cublas
+OR NOT TARGET CUDA::cufft
+   )
     return()
 endif()
 
@@ -30,15 +32,12 @@ cython_add_module(PyCuAmpcor
     )
 target_include_directories(PyCuAmpcor PRIVATE
     src
-    ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES} # <cuda_runtime.h>
-    )
-target_link_directories(PyCuAmpcor PRIVATE
-    ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES} # cufft
     )
 target_link_libraries(PyCuAmpcor PRIVATE
+    CUDA::cufft
+    CUDA::cublas
     GDAL::GDAL
     Python::NumPy
-    cufft
     )
 
 InstallSameDir(