diff --git a/src/trace_processor/metrics/sql/android/android_cpu_raw_metrics_per_core.sql b/src/trace_processor/metrics/sql/android/android_cpu_raw_metrics_per_core.sql
index e17acd3031..f6da6944e6 100644
--- a/src/trace_processor/metrics/sql/android/android_cpu_raw_metrics_per_core.sql
+++ b/src/trace_processor/metrics/sql/android/android_cpu_raw_metrics_per_core.sql
@@ -27,7 +27,7 @@ SELECT
   -- i.e. divide by 1e3 in total.
   -- We use millicycles as we want to preserve this level of precision
   -- for future calculations.
-  SUM(dur * freq_khz / 1000) AS millicycles,
+  CAST(SUM(dur * freq_khz / 1000) AS INT) AS millicycles,
   CAST(SUM(dur * freq_khz / 1000) / 1e9 AS INT) AS mcycles,
   SUM(dur) AS runtime_ns,
   MIN(freq_khz) AS min_freq_khz,
diff --git a/src/trace_processor/metrics/sql/android/anr/anrs.sql b/src/trace_processor/metrics/sql/android/anr/anrs.sql
index 769fe14214..cba5d84a86 100644
--- a/src/trace_processor/metrics/sql/android/anr/anrs.sql
+++ b/src/trace_processor/metrics/sql/android/anr/anrs.sql
@@ -15,7 +15,7 @@
 
 -- One row per ANR that occurred in the trace.
 DROP TABLE IF EXISTS android_anr_anrs;
-CREATE TABLE android_anr_anrs AS
+CREATE PERFETTO TABLE android_anr_anrs AS
 -- Process and PID that ANRed.
 WITH anr_process AS (
   SELECT