diff --git a/src/common/m_mpi_common.fpp b/src/common/m_mpi_common.fpp
index abd142bf9..5e11fdfd0 100644
--- a/src/common/m_mpi_common.fpp
+++ b/src/common/m_mpi_common.fpp
@@ -151,20 +151,26 @@ contains
             MPI_IO_levelsetnorm_DATA%var%vf => levelset_norm%vf
 #else
             MPI_IO_IB_DATA%var%sf => ib_markers%sf(0:m, 0:n, 0:p)
+
+#ifndef MFC_POST_PROCESS
             MPI_IO_levelset_DATA%var%sf => levelset%sf(0:m, 0:n, 0:p, 1:num_ibs)
             MPI_IO_levelsetnorm_DATA%var%vf => levelset_norm%vf(0:m, 0:n, 0:p, 1:num_ibs, 1:3)
+#endif
+
 #endif
             call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
                                           MPI_ORDER_FORTRAN, MPI_INTEGER, MPI_IO_IB_DATA%view, ierr)
+            call MPI_TYPE_COMMIT(MPI_IO_IB_DATA%view, ierr)
+
+#ifndef MFC_POST_PROCESS
             call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
                                           MPI_ORDER_FORTRAN, MPI_DOUBLE_PRECISION, MPI_IO_levelset_DATA%view, ierr)
             call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
                                           MPI_ORDER_FORTRAN, MPI_DOUBLE_PRECISION, MPI_IO_levelsetnorm_DATA%view, ierr)
 
-            call MPI_TYPE_COMMIT(MPI_IO_IB_DATA%view, ierr)
             call MPI_TYPE_COMMIT(MPI_IO_levelset_DATA%view, ierr)
             call MPI_TYPE_COMMIT(MPI_IO_levelsetnorm_DATA%view, ierr)
-
+#endif
         end if
 
 #ifndef MFC_POST_PROCESS
diff --git a/src/pre_process/m_compute_levelset.fpp b/src/pre_process/m_compute_levelset.fpp
index 95b9ac395..77003df16 100644
--- a/src/pre_process/m_compute_levelset.fpp
+++ b/src/pre_process/m_compute_levelset.fpp
@@ -94,7 +94,7 @@ contains
         do i = 0, m
             do j = 0, n
 
-                if (patch_ib(ib_patch_id)%theta /= dflt_real) then
+                if (.not. f_is_default(patch_ib(ib_patch_id)%theta)) then
                     x_act = (x_cc(i) - x_centroid)*cos(theta) - (y_cc(j) - y_centroid)*sin(theta) + x_centroid
                     y_act = (x_cc(i) - x_centroid)*sin(theta) + (y_cc(j) - y_centroid)*cos(theta) + y_centroid
                 else
@@ -183,7 +183,7 @@ contains
             do j = 0, n
                 do i = 0, m
 
-                    if (patch_ib(ib_patch_id)%theta /= dflt_real) then
+                    if (.not. f_is_default(patch_ib(ib_patch_id)%theta)) then
                         x_act = (x_cc(i) - x_centroid)*cos(theta) - (y_cc(j) - y_centroid)*sin(theta) + x_centroid
                         y_act = (x_cc(i) - x_centroid)*sin(theta) + (y_cc(j) - y_centroid)*cos(theta) + y_centroid
                     else
diff --git a/src/simulation/m_start_up.fpp b/src/simulation/m_start_up.fpp
index 36705a135..6ce992d19 100644
--- a/src/simulation/m_start_up.fpp
+++ b/src/simulation/m_start_up.fpp
@@ -720,7 +720,11 @@ contains
         else
 
             ! Open the file to read conservative variables
-            write (file_loc, '(I0,A)') t_step_start, '.dat'
+            if (cfl_dt) then
+                write (file_loc, '(I0,A)') n_start, '.dat'
+            else
+                write (file_loc, '(I0,A)') t_step_start, '.dat'
+            end if
             file_loc = trim(case_dir)//'/restart_data'//trim(mpiiofs)//trim(file_loc)
             inquire (FILE=trim(file_loc), EXIST=file_exist)