diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index 2e6283da..26a63f1d 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -796,7 +796,7 @@ def clean_df_stats_pl(datadf, workstrokesonly=True, ignorehr=True,
                 sum = datadf[metric].std()
                 if sum == 0 or np.isnan(sum):
                     ignoreadvanced = True
-            except KeyError:
+            except (KeyError, TypeError):
                 pass
 
     if not ignoreadvanced:
@@ -1495,22 +1495,22 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
                 data = dataprep(
                     rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
                 try:
-                    df = pd.read_parquet(csvfilenames[0], columns=columns)
+                    df = pl.read_parquet(csvfilenames[0], columns=columns)
                 except:
-                    df = pd.DataFrame
+                    df = pl.DataFrame
             else:
-                df = pd.DataFrame()
+                df = pl.DataFrame()
         except:
             rowdata, row = getrowdata(id=ids[0])
             if rowdata and len(rowdata.df):  # pragma: no cover
                 data = dataprep(
                     rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
                 try:
-                    df = pd.read_parquet(csvfilenames[0], columns=columns)
+                    df = pl.read_parquet(csvfilenames[0], columns=columns)
                 except:
-                    df = pd.DataFrame()
+                    df = pl.DataFrame()
             else:
-                df = pd.DataFrame()
+                df = pl.DataFrame()
 
     if compute and len(df):
         data = df.clone()
@@ -1523,7 +1523,9 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
 
         return data
 
-    df = df.fill_nan(None).drop_nulls()
+    if not df.is_empty():
+        df = df.fill_nan(None).drop_nulls()
+        
     return df
 
     
diff --git a/rowers/models.py b/rowers/models.py
index 483df158..a05de7c5 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3833,9 +3833,12 @@ def auto_delete_file_on_delete(sender, instance, **kwargs):
     # remove parquet file
     try:
         dirname = 'media/strokedata_{id}.parquet.gz'.format(id=instance.id)
-        shutil.rmtree(dirname)
+        os.remove(dirname)
     except FileNotFoundError:
-        pass
+        try:
+            shutil.rmtree(dirname)
+        except:
+            pass
 
     # remove parquet file
     try:
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index ec58e900..d96a3d77 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ