diff --git a/Source/smokeview/IOboundary.c b/Source/smokeview/IOboundary.c
index dd66aa940b..80913ca2ee 100644
--- a/Source/smokeview/IOboundary.c
+++ b/Source/smokeview/IOboundary.c
@@ -1460,8 +1460,8 @@ FILE_SIZE ReadBoundaryBndf(int ifile, int load_flag, int *errorcode){
     }
     UpdateBoundaryType();
     UpdateUnitDefs();
-    update_times = 1;
     patchi->npatches=0;
+    UpdateTimes();
     patchi->ntimes_old=0;
     patchi->ntimes=0;
     updatemenu=1;
diff --git a/Source/smokeview/drawGeometry.c b/Source/smokeview/drawGeometry.c
index e93a590d20..44ab0cf6e6 100644
--- a/Source/smokeview/drawGeometry.c
+++ b/Source/smokeview/drawGeometry.c
@@ -2865,14 +2865,21 @@ void UpdateFaceListsWorker(void){
     nface_transparent_double += n_transparent_double;
     nface_outlines += n_outlines;
 
+    meshi->nface_normals_single_DOWN_X = 0;
+    meshi->nface_normals_single_UP_X   = 0;
+    meshi->nface_normals_single_DOWN_Y = 0;
+    meshi->nface_normals_single_UP_Y   = 0;
+    meshi->nface_normals_single_DOWN_Z = 0;
+    meshi->nface_normals_single_UP_Z   = 0;
+    meshi->face_normals_single_DOWN_X  = NULL;
+    meshi->face_normals_single_UP_X    = NULL;
+    meshi->face_normals_single_DOWN_Y  = NULL;
+    meshi->face_normals_single_UP_Y    = NULL;
+    meshi->face_normals_single_DOWN_Z  = NULL;
+    meshi->face_normals_single_UP_Z    = NULL;
+
     if(blockage_draw_option != 1)continue;
 
-    meshi->nface_normals_single_DOWN_X=0;
-    meshi->nface_normals_single_UP_X=0;
-    meshi->nface_normals_single_DOWN_Y=0;
-    meshi->nface_normals_single_UP_Y=0;
-    meshi->nface_normals_single_DOWN_Z=0;
-    meshi->nface_normals_single_UP_Z=0;
     if(n_normals_single>0){
       int iface;
       int istartD=-1,istartU=-1;
@@ -3041,6 +3048,8 @@ void DrawSelectFaces(){
         culldata *cullport;\
         facedata *facei;\
         float *vertices;\
+        assert(i>=0&&i<meshi->nface_normals_single);\
+        assert(face_START!=NULL);\
         facei = face_START[i];\
         cullport=facei->cullport;\
         if(cullport!=NULL&&cullport->vis==0)continue;\
diff --git a/Source/smokeview/options.h b/Source/smokeview/options.h
index f6c03a0981..e1ecad0810 100644
--- a/Source/smokeview/options.h
+++ b/Source/smokeview/options.h
@@ -10,7 +10,7 @@
 #define pp_THREAD           // turn on multi-threading
 //#define pp_SMOKE_THREAD     // use multi-threading for merging smoke
 //#define pp_BOUNDING_BOX   // draw bounding box when mouse is pressed and option selected
-#define pp_DEBUG_OSX_CRASH  // debug print to test crash on mac
+//#define pp_DEBUG_OSX_CRASH  // debug print to test crash on mac
 
 #ifdef pp_FRAME          // turn on each frame type if pp_FRAME is set
 #define pp_BOUNDFRAME    // turn on frame code for boundary files