diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
index 6eb75b8ce..f8f251806 100644
--- a/.github/workflows/intel.yml
+++ b/.github/workflows/intel.yml
@@ -33,7 +33,7 @@ env:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - name: checkout-upp  # This is for getting spack.yaml
@@ -66,7 +66,6 @@ jobs:
       - name: install-dependencies-with-spack
         if: steps.cache-env.outputs.cache-hit != 'true'
         run: |
-          sudo mv /usr/local/ /usr_local_mv
           git clone -c feature.manyFiles=true https://github.com/NOAA-EMC/spack.git
           source spack/share/spack/setup-env.sh
           spack env create upp-env UPP/ci/spack.yaml
@@ -81,7 +80,7 @@ jobs:
 
   build:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - name: checkout-upp
diff --git a/sorc/ncep_post.fd/SURFCE.f b/sorc/ncep_post.fd/SURFCE.f
index e08cd122d..50c8445ea 100644
--- a/sorc/ncep_post.fd/SURFCE.f
+++ b/sorc/ncep_post.fd/SURFCE.f
@@ -6687,7 +6687,7 @@ subroutine qpf_comp(igetfld,compfile,fcst)
       character(len=256), intent(in) :: compfile
       integer, intent(in) :: igetfld,fcst
       integer :: trange,invstat
-      real, dimension(IM,JM) :: outgrid
+      real, dimension(ista:iend,jsta:jend) :: outgrid
 
       real, allocatable, dimension(:,:) :: mscValue
 
@@ -6700,6 +6700,8 @@ subroutine qpf_comp(igetfld,compfile,fcst)
 
       integer :: i, j, k, ii, jj
 
+      outgrid = 0
+
 !     Read in reference grid.
       INQUIRE(FILE=compfile, EXIST=file_exists)
       if (file_exists) then
@@ -6750,13 +6752,9 @@ subroutine qpf_comp(igetfld,compfile,fcst)
                   outgrid(I,J) = 1.0
                ELSE IF (fcst .GT. 1 .AND. AVGPREC_CONT(I,J)*FLOAT(IFHR)*3600.*1000./DTQ2 .GT. mscValue(I,J)) THEN
                   outgrid(I,J) = 1.0
-               ELSE
-                  outgrid(I,J) = 0.0
                ENDIF
             ENDDO
          ENDDO
-       ELSE
-         outgrid = 0.0*AVGPREC
        ENDIF
       ENDIF
 !      write(*,*) 'FFG MAX, MIN:', &
diff --git a/tests/compile_upp.sh b/tests/compile_upp.sh
index 30f1642ce..9e36cd47f 100755
--- a/tests/compile_upp.sh
+++ b/tests/compile_upp.sh
@@ -30,7 +30,7 @@ wrfio_opt=" -DBUILD_WITH_WRFIO=ON"
 compiler="intel"
 verbose_opt=""
 debug_opt=""
-while getopts ":p:gwc:vhiI:d" opt; do
+while getopts ":p:gwc:vhiId" opt; do
   case $opt in
     p)
       prefix=$OPTARG