diff --git a/checkin_notes b/checkin_notes
index 37351efb94..e1cee3133f 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3951,3 +3951,12 @@ David  15 Apr 2009
         translation.inc
     samples/example_app/
         uc2.cpp
+
+Davaid  16 Apr 2009
+    - client: another try at fixing the above crash
+    - web: don't show plan class in separate column in apps list; fixes #874
+
+    client/
+        app_control.cpp
+    html/user/
+        apps.php
diff --git a/client/app_control.cpp b/client/app_control.cpp
index 4750f46757..8b532e1cb5 100644
--- a/client/app_control.cpp
+++ b/client/app_control.cpp
@@ -413,7 +413,7 @@ void ACTIVE_TASK_SET::send_heartbeats() {
         atp = active_tasks[i];
         if (!atp->process_exists()) continue;
         if (!atp->app_client_shm.shm) continue;
-		sprintf(buf, "<heartbeat/>"
+		snprintf(buf, sizeof(buf), "<heartbeat/>"
 			"<wss>%e</wss>"
 			"<max_wss>%e</max_wss>",
 			atp->procinfo.working_set_size, ar
diff --git a/html/user/apps.php b/html/user/apps.php
index 7bec4102a9..e77da6a974 100644
--- a/html/user/apps.php
+++ b/html/user/apps.php
@@ -46,7 +46,6 @@ foreach ($apps as $app) {
             <tr>
                 <th>".tra("Platform")."</th>
                 <th>".tra("Version")."</th>
-                <th>".tra("Plan class")."</th>
                 <th>".tra("Installation time")."</th>
             </tr>
         ";
@@ -65,23 +64,25 @@ foreach ($apps as $app) {
         }
         foreach($avs as $av) {
             if ($av->deprecated) continue;
-            $y = pretty_time_str($av->create_time);
+            $create_time_f = pretty_time_str($av->create_time);
             if ($xml) {
                 echo "    <version>\n";
                 echo "        <platform_short>$platform->name</platform_short>\n";
                 echo "        <platform_long>$platform->user_friendly_name</platform_long>\n";
                 echo "        <version_num>$av->version_num</version_num>\n";
                 echo "        <plan_class>$av->plan_class</plan_class>\n";
-                echo "        <date>$y</date>\n";
+                echo "        <date>$create_time_f</date>\n";
                 echo "        <date_unix>$av->create_time</date_unix>\n";
                 echo "    </version>\n";
             } else {
-                $x = sprintf("%0.2f", $av->version_num/100);
+                $version_num_f = sprintf("%0.2f", $av->version_num/100);
+                if ($av->plan_class) {
+                    $version_num_f .= " ($av->plan_class)";
+                }
                 echo "<tr>
                     <td>$platform->user_friendly_name</td>
-                    <td>$x</td>
-                    <td>$av->plan_class</td>
-                    <td>$y</td>
+                    <td>$version_num_f</td>
+                    <td>$create_time_f</td>
                     </tr>
                 ";
             }