diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 4c439621..f6eb2dbf 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -2178,7 +2178,7 @@ def read_cols_df_sql(ids, columns, convertnewtons=True):
             try:
                 df = pd.read_parquet(f,columns=columns)
                 data.append(df)
-            except OSError:
+            except (OSError,IndexError):
                 rowdata,row = getrowdata(id=id)
                 if rowdata and len(rowdata.df):
                     datadf = dataprep(rowdata.df,id=id,bands=True,otwpower=True,barchart=True)
diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index 7f4d23c0..709ccf1d 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -1400,7 +1400,7 @@ def default_class(r,w,race):
                         agemin__lt=age,agemax__gt=age
                         ).order_by(
                             "agemax","-agemin","boattype","sex",
-                            "weightcategory","referencespeed")
+                            "weightclass","referencespeed")
 
             if standards.count()==0:
                 # boolean, boattype, boatclass, adaptiveclass, weightclass, sex, coursestandard,
diff --git a/rowers/tasks.py b/rowers/tasks.py
index f573ec44..26ef86e3 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -450,6 +450,8 @@ def handle_check_race_course(self,
             t = time.localtime()
             timestamp = time.strftime('%b-%d-%Y_%H%M', t)
             f.write('\n')
+            f.write('Course id {n}, Record id {m}'.format(n=courseid,m=recordid))
+            f.write('\n')
             f.write(timestamp)
             f.write(' ')
             f.write('Found {n} entrytimes'.format(n=len(entrytimes)))
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index 8c1cba78..f75a84c2 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -3134,7 +3134,7 @@ def virtualevent_entry_edit_view(request,id=0,entryid=0):
     records = resultobj.objects.filter(
         userid = r.id,
         race=race
-        )
+        ).exclude(id=entryid)
 
     try:
         record = resultobj.objects.get(id=entryid)