diff --git a/.github/actions/r_build/action.yml b/.github/actions/r_build/action.yml
index e2b611e35..9660e29ef 100644
--- a/.github/actions/r_build/action.yml
+++ b/.github/actions/r_build/action.yml
@@ -10,8 +10,8 @@ runs:
     - name: Create download location for Spark
       shell: bash
       run: |
-        sudo mkdir -p /usr/spark-download/raw
         sudo mkdir -p /usr/spark-download/unzipped
+        sudo mkdir -p /usr/spark-download/raw
         sudo chown -R $USER: /usr/spark-download/
     - name: Cache Spark download
       id: cache-spark
diff --git a/R/.gitignore b/R/.gitignore
index bef411cb1..eb4bec116 100644
--- a/R/.gitignore
+++ b/R/.gitignore
@@ -1 +1,2 @@
 **/.Rhistory
+**/*.tar.gz
diff --git a/R/install_deps.R b/R/install_deps.R
index 19654f985..68cb8a355 100644
--- a/R/install_deps.R
+++ b/R/install_deps.R
@@ -31,6 +31,6 @@ for(repo in names(mirror_status)){
 
 .libPaths(c("/usr/lib/R/site-library", .libPaths()))
 
-install.packages("pkgbuild", repos=repo)
-install.packages("roxygen2", repos=repo)
-install.packages("sparklyr", repos=repo)
\ No newline at end of file
+install.packages("pkgbuild", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
+install.packages("roxygen2", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
+install.packages("sparklyr", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
\ No newline at end of file
diff --git a/R/sparkR-mosaic/sparkrMosaic/DESCRIPTION b/R/sparkR-mosaic/sparkrMosaic/DESCRIPTION
index 3fe2ab1a6..eb25a280a 100644
--- a/R/sparkR-mosaic/sparkrMosaic/DESCRIPTION
+++ b/R/sparkR-mosaic/sparkrMosaic/DESCRIPTION
@@ -8,7 +8,7 @@ Description: This package extends SparkR to bring the Databricks Mosaic for geos
 License: Databricks
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.3
 Collate: 
     'enableMosaic.R'
     'generics.R'
diff --git a/R/sparkR-mosaic/tests.R b/R/sparkR-mosaic/tests.R
index 34b0c61f7..7cb4e9c50 100644
--- a/R/sparkR-mosaic/tests.R
+++ b/R/sparkR-mosaic/tests.R
@@ -66,7 +66,7 @@ sdf <- withColumn(sdf, "transformed_geom", st_transform(column("geom_with_srid")
 # Grid functions
 sdf <- withColumn(sdf, "grid_longlatascellid", grid_longlatascellid(lit(1), lit(1), lit(1L)))
 sdf <- withColumn(sdf, "grid_pointascellid", grid_pointascellid(column("point_wkt"), lit(1L)))
-sdf <- withColumn(sdf, "grid_boundaryaswkb", grid_boundaryaswkb( SparkR::cast(lit(1), "long")))
+sdf <- withColumn(sdf, "grid_boundaryaswkb", grid_boundaryaswkb(column("grid_pointascellid")))
 sdf <- withColumn(sdf, "grid_polyfill", grid_polyfill(column("wkt"), lit(1L)))
 sdf <- withColumn(sdf, "grid_tessellateexplode", grid_tessellateexplode(column("wkt"), lit(1L)))
 sdf <- withColumn(sdf, "grid_tessellate", grid_tessellate(column("wkt"), lit(1L)))
@@ -74,7 +74,7 @@ sdf <- withColumn(sdf, "grid_tessellate", grid_tessellate(column("wkt"), lit(1L)
 # Deprecated
 sdf <- withColumn(sdf, "point_index_lonlat", point_index_lonlat(lit(1), lit(1), lit(1L)))
 sdf <- withColumn(sdf, "point_index_geom", point_index_geom(column("point_wkt"), lit(1L)))
-sdf <- withColumn(sdf, "index_geometry", index_geometry( SparkR::cast(lit(1), "long")))
+sdf <- withColumn(sdf, "index_geometry", index_geometry(column("point_index_geom")))
 sdf <- withColumn(sdf, "polyfill", polyfill(column("wkt"), lit(1L)))
 sdf <- withColumn(sdf, "mosaic_explode", mosaic_explode(column("wkt"), lit(1L)))
 sdf <- withColumn(sdf, "mosaicfill", mosaicfill(column("wkt"), lit(1L)))
diff --git a/R/sparklyr-mosaic/sparklyrMosaic/DESCRIPTION b/R/sparklyr-mosaic/sparklyrMosaic/DESCRIPTION
index 9bf65215a..0e5bcbb38 100644
--- a/R/sparklyr-mosaic/sparklyrMosaic/DESCRIPTION
+++ b/R/sparklyr-mosaic/sparklyrMosaic/DESCRIPTION
@@ -8,7 +8,7 @@ Description: This package extends sparklyr to bring the Databricks Mosaic for ge
 License: Databricks
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.3
 Collate: 
     'enableMosaic.R'
     'sparkFunctions.R'