diff --git a/src/lib/components/fitness/FitnessChart.svelte b/src/lib/components/fitness/FitnessChart.svelte
index b9ccbe31..97e4ca92 100644
--- a/src/lib/components/fitness/FitnessChart.svelte
+++ b/src/lib/components/fitness/FitnessChart.svelte
@@ -5,7 +5,7 @@
 	/**
 	 * @type {{
 	 *   type?: 'line' | 'bar',
-	 *   data: { labels: string[], datasets: Array<{ label: string, data: number[], borderColor?: string, backgroundColor?: string }> },
+	 *   data: { labels: string[], datasets: Array<{ label: string, data: (number|null)[], borderColor?: string, backgroundColor?: string, borderWidth?: number, pointRadius?: number, pointBackgroundColor?: string, tension?: number, fill?: boolean|string, order?: number }> },
 	 *   title?: string,
 	 *   height?: string,
 	 *   yUnit?: string
diff --git a/src/lib/components/fitness/TemplateCard.svelte b/src/lib/components/fitness/TemplateCard.svelte
index 64b2fc3a..84e6f880 100644
--- a/src/lib/components/fitness/TemplateCard.svelte
+++ b/src/lib/components/fitness/TemplateCard.svelte
@@ -25,7 +25,7 @@
 	}
 </script>
 
-<button class="template-card" onclick={() => onStart?.()}>
+<div class="template-card" role="button" tabindex="0" onclick={() => onStart?.()} onkeydown={(e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); onStart?.(); }}}>
 	<div class="card-header">
 		<h3 class="card-title">{template.name}</h3>
 		{#if onMenu}
@@ -50,7 +50,7 @@
 	{#if lastUsed}
 		<p class="last-used">Last performed: {formatDate(lastUsed)}</p>
 	{/if}
-</button>
+</div>
 
 <style>
 	.template-card {
diff --git a/src/models/WorkoutSession.ts b/src/models/WorkoutSession.ts
index 7d36b3fd..00c00746 100644
--- a/src/models/WorkoutSession.ts
+++ b/src/models/WorkoutSession.ts
@@ -9,6 +9,7 @@ export interface ICompletedSet {
 }
 
 export interface ICompletedExercise {
+  exerciseId: string;
   name: string;
   sets: ICompletedSet[];
   restTime?: number;
@@ -59,6 +60,11 @@ const CompletedSetSchema = new mongoose.Schema({
 });
 
 const CompletedExerciseSchema = new mongoose.Schema({
+  exerciseId: {
+    type: String,
+    required: true,
+    trim: true
+  },
   name: {
     type: String,
     required: true,
diff --git a/src/routes/api/fitness/sessions/[id]/+server.ts b/src/routes/api/fitness/sessions/[id]/+server.ts
index 8219ee5b..e816a51c 100644
--- a/src/routes/api/fitness/sessions/[id]/+server.ts
+++ b/src/routes/api/fitness/sessions/[id]/+server.ts
@@ -64,7 +64,7 @@ export const PUT: RequestHandler = async ({ params, request, locals }) => {
 
     // Calculate duration if both times are provided
     if (updateData.startTime && updateData.endTime) {
-      updateData.duration = Math.round((updateData.endTime.getTime() - updateData.startTime.getTime()) / (1000 * 60));
+      updateData.duration = Math.round(((updateData.endTime as Date).getTime() - (updateData.startTime as Date).getTime()) / (1000 * 60));
     }
 
     const workoutSession = await WorkoutSession.findOneAndUpdate(
diff --git a/src/routes/api/fitness/stats/profile/+server.ts b/src/routes/api/fitness/stats/profile/+server.ts
index 5daa1b25..000c137e 100644
--- a/src/routes/api/fitness/stats/profile/+server.ts
+++ b/src/routes/api/fitness/stats/profile/+server.ts
@@ -88,8 +88,8 @@ export const GET: RequestHandler = async ({ locals }) => {
 		weightChart.labels.push(
 			d.toLocaleDateString('en', { month: 'short', day: 'numeric' })
 		);
-		weightChart.data.push(m.weight);
-		weights.push(m.weight);
+		weightChart.data.push(m.weight!);
+		weights.push(m.weight!);
 	}
 
 	// Adaptive window: 7 if enough data, otherwise half the data (min 2)
diff --git a/src/routes/api/fitness/templates/+server.ts b/src/routes/api/fitness/templates/+server.ts
index 10d0e323..93e92444 100644
--- a/src/routes/api/fitness/templates/+server.ts
+++ b/src/routes/api/fitness/templates/+server.ts
@@ -15,16 +15,16 @@ export const GET: RequestHandler = async ({ url, locals }) => {
     
     const includePublic = url.searchParams.get('include_public') === 'true';
     
-    let query: Record<string, unknown> = {
-      $or: [
-        { createdBy: session.user.nickname }
-      ]
-    };
+    const orConditions: Record<string, unknown>[] = [
+      { createdBy: session.user.nickname }
+    ];
 
     if (includePublic) {
-      query.$or.push({ isPublic: true });
+      orConditions.push({ isPublic: true });
     }
 
+    const query = { $or: orConditions };
+
     const templates = await WorkoutTemplate.find(query).sort({ updatedAt: -1 });
     
     return json({ templates });