diff --git a/.travis.yml b/.travis.yml
index 8d376b6f..73542f14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,6 @@ addons:
         sources:
             - boost-latest
             - ubuntu-toolchain-r-test
-        packages:
-            - g++-4.8
 
 matrix:
     include:
@@ -29,12 +27,6 @@ matrix:
         - os: linux
           compiler: clang
           env: LINK=dynamic
-          addons:
-            apt:
-              sources:
-                - sourceline: 'ppa:h-rayflood/llvm'
-              packages:
-                - clang-3.4
         - os: linux
           compiler: clang
           env: LINK=static
@@ -47,6 +39,10 @@ matrix:
         - os: linux
           compiler: gcc
           env: LINK=dynamic
+          addons:
+            apt:
+              packages:
+                - g++-4.8
         - os: linux
           compiler: gcc
           env: LINK=static
@@ -72,11 +68,13 @@ before_install:
 
 install:
 
-    # Export CC/CXX to control gcc version.
-    - if [[ $GCC                         ]]; then export CC=gcc-4.8; export CXX=g++-4.8; fi
-
-    # Export CC/CXX to control clang version.
-    - if [[ $CLANG                       ]]; then export CC=clang-3.4; export CXX=clang++-3.4; fi
+    # Export CC/CXX to control compiler/version.
+    - if [[ $OSX   && $CLANG && $STATIC  ]]; then export CC=clang; export CXX=clang++; fi
+    - if [[ $LINUX && $CLANG && $STATIC  ]]; then export CC=clang-3.4; export CXX=clang++-3.4; fi
+    - if [[ $LINUX && $GCC   && $STATIC  ]]; then export CC=gcc; export CXX=g++; fi
+    - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
+    - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
+    - if [[ $LINUX && $GCC   && $DYNAMIC ]]; then export CC=gcc-4.8; export CXX=g++-4.8; fi
 
     # Download and install packages.
     - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then brew unlink boost; brew install boost; fi
@@ -87,7 +85,7 @@ script:
     - if [[ $OSX   && $CLANG && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
     - if [[ $LINUX && $CLANG && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
     - if [[ $LINUX && $GCC   && $STATIC  ]]; then CC=$CC CXX=$CXX ./install.sh --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
-    - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh ; fi
+    - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --disable-static; fi
     - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --build-boost --disable-ndebug --disable-static --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
     - if [[ $LINUX && $GCC   && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --disable-static --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi
 
diff --git a/include/bitcoin/protocol.hpp b/include/bitcoin/protocol.hpp
index b4514a10..dbb16195 100644
--- a/include/bitcoin/protocol.hpp
+++ b/include/bitcoin/protocol.hpp
@@ -8,7 +8,7 @@
 #define LIBBITCOIN_PROTOCOL_HPP
 
 /**
- * API Users: Include only this header. Direct use of other headers is fragile 
+ * API Users: Include only this header. Direct use of other headers is fragile
  * and unsupported as header organization is subject to change.
  *
  * Maintainers: Do not include this header internal to this library.