diff --git a/cmake/FindCLEW.cmake b/cmake/FindCLEW.cmake
index 8f92ea7e9..12b2c44a8 100644
--- a/cmake/FindCLEW.cmake
+++ b/cmake/FindCLEW.cmake
@@ -57,7 +57,7 @@ find_path(CLEW_INCLUDE_DIR
   HINTS
     ${_clew_SEARCH_DIRS}
   PATH_SUFFIXES
-    include
+    include include/CL
   NO_DEFAULT_PATH
   DOC "The directory where clew.h resides")
 
@@ -67,7 +67,7 @@ find_library(CLEW_LIBRARY
   PATHS
     ${_clew_SEARCH_DIRS}
   PATH_SUFFIXES
-    lib lib64
+    lib lib64 lib/static
   NO_DEFAULT_PATH
   DOC "The CLEW library")
 
diff --git a/cmake/FindMaya.cmake b/cmake/FindMaya.cmake
index d4027c72a..2c8b79fa3 100644
--- a/cmake/FindMaya.cmake
+++ b/cmake/FindMaya.cmake
@@ -200,8 +200,8 @@ foreach(MAYA_LIB
     Foundation
     IMFbase
     tbb
-    cg
-    cgGL)
+    Cg
+    CgGL)
 
     find_library(MAYA_${MAYA_LIB}_LIBRARY
             ${MAYA_LIB}
diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
index 79c6ced57..1e27cbb53 100644
--- a/cmake/FindTBB.cmake
+++ b/cmake/FindTBB.cmake
@@ -58,6 +58,7 @@ else ()
             "${TBB_LOCATION}/include"
             "$ENV{TBB_LOCATION}/include"
         PATHS
+	    /opt/intel/tbb/include
             /usr/include
             /usr/local/include
             /usr/openwin/share/include
@@ -118,6 +119,7 @@ foreach(TBB_LIB tbb             tbb_debug
             "$ENV{TBB_LOCATION}/lib"
             "$ENV{TBB_LOCATION}/bin"
             "$ENV{PROGRAMFILES}/TBB/lib"
+	    /opt/intel/tbb/lib/
             /usr/lib
             /usr/lib/w32api
             /usr/local/lib
diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt
index 4b3cec84a..cdcb39fa2 100644
--- a/opensubdiv/CMakeLists.txt
+++ b/opensubdiv/CMakeLists.txt
@@ -106,7 +106,7 @@ if (NOT NO_LIB)
     if( CUDA_FOUND )
         include_directories( "${CUDA_INCLUDE_DIRS}" )
         if (UNIX)
-            list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC --gpu-architecture compute_11 )
+            list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC --gpu-architecture compute_20 )
         endif()
     endif()