diff --git a/examples/main.c b/examples/main.c
index 7ede802578f6d619090f51336886ee7571c30209..0a661d35abc3130f43d6fb01c3e99960228fa4c0 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -236,8 +236,8 @@ int main(int argc, char *argv[]) {
         "Executing a dry run. No i/o or time integration will be performed.");
 
   /* Report CPU frequency. */
+  cpufreq = clocks_get_cpufreq();
   if (myrank == 0) {
-    cpufreq = clocks_get_cpufreq();
     message("CPU frequency used for tick conversion: %llu Hz", cpufreq);
   }
 
diff --git a/examples/plot_tasks_MPI.py b/examples/plot_tasks_MPI.py
index f6a0d145cbf84eb78aa7712da178b4cd9523db6c..cf591028b6dc3f724847b52c9efac4355d27f87e 100755
--- a/examples/plot_tasks_MPI.py
+++ b/examples/plot_tasks_MPI.py
@@ -119,13 +119,13 @@ data = pl.loadtxt( infile )
 
 # Recover the start and end time
 full_step = data[0,:]
-tic_step = int(full_step[4])
-toc_step = int(full_step[5])
+tic_step = int(full_step[5])
+toc_step = int(full_step[6])
 CPU_CLOCK = float(full_step[-1])
-data = data[1:,:]
 
 print "CPU frequency:", CPU_CLOCK / 1.e9
 
+
 nranks = int(max(data[:,0])) + 1
 print "Number of ranks:", nranks
 nthread = int(max(data[:,1])) + 1
@@ -150,7 +150,12 @@ if delta_t == 0:
 for rank in range(nranks):
     data = sdata[sdata[:,0] == rank]
 
-    start_t = min(data[:,5])
+    full_step = data[0,:]
+    tic_step = int(full_step[5])
+    toc_step = int(full_step[6])
+    data = data[1:,:]
+
+    start_t = tic_step
     data[:,5] -= start_t
     data[:,6] -= start_t
     end_t = (toc_step - start_t) / CPU_CLOCK * 1000
@@ -160,7 +165,7 @@ for rank in range(nranks):
     for i in range(nthread):
         tasks[i] = []
 
-    num_lines = pl.size(data) / 10
+    num_lines = pl.shape(data)[0]
     for line in range(num_lines):
         thread = int(data[line,1])
         tasks[thread].append({})