diff --git a/macros/adapters/bigquery/pageviews/snowplow_page_views.sql b/macros/adapters/bigquery/pageviews/snowplow_page_views.sql
index 93386c5..f9b63cf 100644
--- a/macros/adapters/bigquery/pageviews/snowplow_page_views.sql
+++ b/macros/adapters/bigquery/pageviews/snowplow_page_views.sql
@@ -183,8 +183,8 @@ page_pings as (
 
   select
     page_view_id,
-    min(timestamp(collector_tstamp)) as page_view_start,
-    max(timestamp(collector_tstamp)) as page_view_end,
+    min(cast(collector_tstamp as timestamp)) as page_view_start,
+    max(cast(collector_tstamp as timestamp)) as page_view_end,
 
     struct(
         max(doc_width) as doc_width,
@@ -205,7 +205,7 @@ page_pings as (
     array_agg(struct(
       event_id,
       event,
-      timestamp(collector_tstamp) as collector_tstamp,
+      cast(collector_tstamp as timestamp) as collector_tstamp,
       pp_xoffset_min,
       pp_xoffset_max,
       pp_yoffset_min,
diff --git a/macros/adapters/bigquery/sessions/snowplow_sessions_tmp.sql b/macros/adapters/bigquery/sessions/snowplow_sessions_tmp.sql
index 0f5eb21..8c92348 100644
--- a/macros/adapters/bigquery/sessions/snowplow_sessions_tmp.sql
+++ b/macros/adapters/bigquery/sessions/snowplow_sessions_tmp.sql
@@ -40,7 +40,7 @@ sessions_agg as (
 
     select
         pv.session_id,
-        array_agg(pv order by pv.page_view_start) as all_pageviews
+        array_agg(pv order by pv.page_view_in_session_index) as all_pageviews
 
     from relevant_page_views as pv
     group by 1