diff --git a/cmake_targets/tools/MODULES/Findxran.cmake b/cmake_targets/tools/MODULES/Findxran.cmake
index 39f0ffeb75..290a782350 100644
--- a/cmake_targets/tools/MODULES/Findxran.cmake
+++ b/cmake_targets/tools/MODULES/Findxran.cmake
@@ -83,12 +83,15 @@ find_path(xran_INCLUDE_DIR
     xran_pkt.h
     xran_pkt_up.h
     xran_sync_api.h
-  PATHS ${xran_LOCATION}
-  PATH_SUFFIXES api
+  HINTS ${xran_LOCATION}
+  PATH_SUFFIXES api include
+  NO_DEFAULT_PATH
 )
 find_library(xran_LIBRARY
   NAMES xran
-  PATHS ${xran_LOCATION}/build
+  HINTS ${xran_LOCATION}
+  PATH_SUFFIXES build api
+  NO_DEFAULT_PATH
 )
 if (NOT xran_LIBRARY)
   message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build")
diff --git a/radio/fhi_72/oran-config.c b/radio/fhi_72/oran-config.c
index f165044429..ea6d158f86 100644
--- a/radio/fhi_72/oran-config.c
+++ b/radio/fhi_72/oran-config.c
@@ -452,7 +452,7 @@ static uint64_t get_u64_mask(const paramdef_t *pd)
   for (int i = 0; i < pd->numelt; ++i) {
     int num = pd->iptr[i];
     AssertFatal(num >= 0 && num < 64, "cannot put element of %d in 64-bit mask\n", num);
-    mask |= 1 << num;
+    mask |= 1LL << num;
   }
   return mask;
 }