diff --git a/db/db.go b/db/db.go
index 9b4d44c..fbd18c5 100644
--- a/db/db.go
+++ b/db/db.go
@@ -154,14 +154,14 @@ func (db *DB) initSchema() error {
 		CREATE TABLE IF NOT EXISTS heat_results (
 			group_id INTEGER NOT NULL,
 			heat_number INTEGER NOT NULL,
-			lane1_time REAL NOT NULL,
-			lane1_position INTEGER NOT NULL,
-			lane2_time REAL NOT NULL,
-			lane2_position INTEGER NOT NULL,
-			lane3_time REAL NOT NULL,
-			lane3_position INTEGER NOT NULL,
-			lane4_time REAL NOT NULL,
-			lane4_position INTEGER NOT NULL,
+			lane1_time REAL NOT NULL DEFAULT 0,
+			lane1_position INTEGER NOT NULL DEFAULT 0,
+			lane2_time REAL NOT NULL DEFAULT 0,
+			lane2_position INTEGER NOT NULL DEFAULT 0,
+			lane3_time REAL NOT NULL DEFAULT 0,
+			lane3_position INTEGER NOT NULL DEFAULT 0,
+			lane4_time REAL NOT NULL DEFAULT 0,
+			lane4_position INTEGER NOT NULL DEFAULT 0,
 			PRIMARY KEY (group_id, heat_number),
 			FOREIGN KEY (group_id) REFERENCES groups (id) ON DELETE CASCADE
 		);
diff --git a/web/server.go b/web/server.go
index 2d779e4..70dfe9d 100644
--- a/web/server.go
+++ b/web/server.go
@@ -441,7 +441,7 @@ func (s *Server) broadcastRaceEvent(event derby.Event) {
 
 	case derby.EventRaceComplete:
 		s.logger.Info("Broadcasting race complete event")
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-100 d-inline-flex align-items-center justify-content-center badge bg-warning'>Race Complete</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-100 d-inline-flex align-items-center justify-content-center badge bg-danger'>Race Complete</div>\n\n")
 	}
 }