diff --git a/.travis.yml b/.travis.yml
index dc984b8d4..abcc36e02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,11 +92,11 @@ jobs:
         travis/postsubmit.sh DefaultRelease BuildDep
 
     ###
-    # Stage: Build library 1
+    # Stage: Build library (1st run)
     ###
 
     # ubuntu-16.10
-    - stage: Build library 1
+    - stage: Build library (1st run)
       os: linux
       compiler: gcc
       env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
@@ -106,7 +106,7 @@ jobs:
         travis/postsubmit.sh DefaultDebug BuildLib1
       before_cache:
         docker cp storm:/storm/. .
-    - stage: Build library 1
+    - stage: Build library (1st run)
       os: linux
       compiler: gcc
       env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
@@ -117,7 +117,7 @@ jobs:
       before_cache:
         docker cp storm:/storm/. .
     # debian-9
-    - stage: Build library 1
+    - stage: Build library (1st run)
       os: linux
       compiler: gcc
       env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
@@ -127,7 +127,7 @@ jobs:
         travis/postsubmit.sh DefaultDebug BuildLib1
       before_cache:
         docker cp storm:/storm/. .
-    - stage: Build library 1
+    - stage: Build library (1st run)
       os: linux
       compiler: gcc
       env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
@@ -138,7 +138,7 @@ jobs:
       before_cache:
         docker cp storm:/storm/. .
     # osx
-    - stage: Build library 1
+    - stage: Build library (1st run)
       os: osx
       compiler: clang
       env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
@@ -146,7 +146,7 @@ jobs:
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/postsubmit.sh DefaultDebug BuildLib1
-    - stage: Build library 1
+    - stage: Build library (1st run)
       os: osx
       compiler: clang
       env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
@@ -156,11 +156,11 @@ jobs:
         travis/postsubmit.sh DefaultRelease BuildLib1
 
     ###
-    # Stage: Build library 2
+    # Stage: Build library (2nd run)
     ###
 
     # ubuntu-16.10
-    - stage: Build library 2
+    - stage: Build library (2nd run)
       os: linux
       compiler: gcc
       env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=ubuntu-16.10
@@ -170,7 +170,7 @@ jobs:
         travis/postsubmit.sh DefaultDebug BuildLib
       before_cache:
         docker cp storm:/storm/. .
-    - stage: Build library 2
+    - stage: Build library (2nd run)
       os: linux
       compiler: gcc
       env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=ubuntu-16.10
@@ -181,7 +181,7 @@ jobs:
       before_cache:
         docker cp storm:/storm/. .
     # debian-9
-    - stage: Build library 2
+    - stage: Build library (2nd run)
       os: linux
       compiler: gcc
       env: BUILD=DefaultDebug COMPILER=gcc-6 LINUX=debian-9
@@ -191,7 +191,7 @@ jobs:
         travis/postsubmit.sh DefaultDebug BuildLib
       before_cache:
         docker cp storm:/storm/. .
-    - stage: Build library 2
+    - stage: Build library (2nd run)
       os: linux
       compiler: gcc
       env: BUILD=DefaultRelease COMPILER=gcc-6 LINUX=debian-9
@@ -202,7 +202,7 @@ jobs:
       before_cache:
         docker cp storm:/storm/. .
     # osx
-    - stage: Build library 2
+    - stage: Build library (2nd run)
       os: osx
       compiler: clang
       env: BUILD=DefaultDebug COMPILER=clang-4.0 STL=libc++
@@ -210,7 +210,7 @@ jobs:
         travis/install_osx.sh
       script: export OS=osx; export COMPILER='clang-4.0'; export STL='libc++';
         travis/postsubmit.sh DefaultDebug BuildLib
-    - stage: Build library 2
+    - stage: Build library (2nd run)
       os: osx
       compiler: clang
       env: BUILD=DefaultRelease COMPILER=clang-4.0 STL=libc++
diff --git a/travis/generate_travis.py b/travis/generate_travis.py
index f1bb22e53..3c2de4b25 100644
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@@ -21,8 +21,8 @@ build_types = [
 # Stages in travis
 stages = [
     ("Build dependencies", "BuildDep"),
-    ("Build library 1", "BuildLib1"),
-    ("Build library 2", "BuildLib"),
+    ("Build library (1st run)", "BuildLib1"),
+    ("Build library (2nd run)", "BuildLib"),
     ("Build all", "BuildAll"),
     ("Test all", "TestAll"),
 ]
diff --git a/travis/postsubmit.sh b/travis/postsubmit.sh
index 5520633c2..a2c4a2c75 100755
--- a/travis/postsubmit.sh
+++ b/travis/postsubmit.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 # Inspired by https://github.com/google/fruit
 
 set -e
@@ -11,7 +11,7 @@ then
   STLARG="-stdlib=$STL"
 fi
 
-if [ "$2" = "BuildLib1"]
+if [ "$2" = "BuildLib1" ]
 then
     TIMEARG="--preserve-status"
 else