diff --git a/android/filament-android/src/main/cpp/Stream.cpp b/android/filament-android/src/main/cpp/Stream.cpp
index f7297762eb..b7955f54d5 100644
--- a/android/filament-android/src/main/cpp/Stream.cpp
+++ b/android/filament-android/src/main/cpp/Stream.cpp
@@ -102,6 +102,7 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_Stream_nBuilderStream(JNIEnv*, jclass,
         jlong nativeStreamBuilder, jlong externalTextureId) {
     StreamBuilder* builder = (StreamBuilder*) nativeStreamBuilder;
+#pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     builder->builder()->stream(externalTextureId);
 #pragma clang diagnostic pop
diff --git a/filament/src/components/LightManager.cpp b/filament/src/components/LightManager.cpp
index 612ad51a7b..6080b9d8e1 100644
--- a/filament/src/components/LightManager.cpp
+++ b/filament/src/components/LightManager.cpp
@@ -374,7 +374,7 @@ float FLightManager::getSpotLightInnerCone(Instance i) const noexcept {
     const auto& spotParams = getSpotParams(i);
     float cosOuter = std::cos(spotParams.outerClamped);
     float scale = spotParams.scaleOffset.x;
-    float inner = std::acos((1.0f / spotParams.scaleOffset.x) + cosOuter);
+    float inner = std::acos((1.0f / scale) + cosOuter);
     return inner;
 }
 
diff --git a/libs/math/benchmarks/benchmark_fast.cpp b/libs/math/benchmarks/benchmark_fast.cpp
index 3c3c3ba201..9cfd68e93a 100644
--- a/libs/math/benchmarks/benchmark_fast.cpp
+++ b/libs/math/benchmarks/benchmark_fast.cpp
@@ -44,16 +44,8 @@ static void BM_trig(benchmark::State& state) noexcept {
     {
         PerformanceCounters pc(state);
         for (auto _ : state) {
-            if (std::is_same<A, Vector>::value) {
-#pragma clang loop vectorize(enable)
-                for (size_t i = 0, c = data.size(); i < c; i++) {
-                    res[i] = f(data[i]);
-                }
-            } else if (std::is_same<A, Scalar>::value) {
-#pragma clang loop unroll(disable) vectorize(disable)
-                for (size_t i = 0, c = data.size(); i < c; i++) {
-                    res[i] = f(data[i]);
-                }
+            for (size_t i = 0, c = data.size(); i < c; i++) {
+                res[i] = f(data[i]);
             }
             benchmark::ClobberMemory();
             benchmark::DoNotOptimize(res);
@@ -81,16 +73,8 @@ static void BM_func(benchmark::State& state) noexcept {
     {
         PerformanceCounters pc(state);
         for (auto _ : state) {
-            if (std::is_same<A, Vector>::value) {
-#pragma clang loop vectorize(enable)
-                for (size_t i = 0, c = data.size(); i < c; i++) {
-                    res[i] = f(data[i]);
-                }
-            } else if (std::is_same<A, Scalar>::value) {
-#pragma clang loop unroll(disable) vectorize(disable)
-                for (size_t i = 0, c = data.size(); i < c; i++) {
-                    res[i] = f(data[i]);
-                }
+            for (size_t i = 0, c = data.size(); i < c; i++) {
+                res[i] = f(data[i]);
             }
             benchmark::ClobberMemory();
             benchmark::DoNotOptimize(res);