diff --git a/.ci/run_codecov.sh b/.ci/run_codecov.sh
index 25f8f870..2272459d 100755
--- a/.ci/run_codecov.sh
+++ b/.ci/run_codecov.sh
@@ -2,12 +2,12 @@ set -evx
 
 cd ${TRAVIS_BUILD_DIR}
 cd build
-cmake .. -DCLI_SINGLE_FILE_TESTS=OFF -DCMAKE_BUILD_TYPE=Coverage
+cmake .. -DCLI_SINGLE_FILE_TESTS=OFF -DCLI_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Coverage
 cmake --build . -- -j2
 cmake --build . --target CLI_coverage
 
 lcov --directory . --capture --output-file coverage.info # capture coverage info
-lcov --remove coverage.info '*/tests/*' '*gtest*' '*gmock*' '/usr/*' --output-file coverage.info # filter out system
+lcov --remove coverage.info '*/tests/*' '*/examples/*' '*gtest*' '*gmock*' '/usr/*' --output-file coverage.info # filter out system
 lcov --list coverage.info #debug info
 # Uploading report to CodeCov
 bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
diff --git a/.travis.yml b/.travis.yml
index 1e7fc855..4bc76b85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: cpp
 sudo: false
+dist: trusty
 branches:
   exclude:
   - gh-pages
@@ -42,6 +43,7 @@ matrix:
         - g++-4.7
     env:
     - COMPILER=4.7
+    - CXXFLAGS=-D_GLIBCXX_USE_NANOSLEEP
   - os: osx
 install:
 - python -c 'import sys; print(sys.version_info[:])'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb660515..7f81c33e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 * Added simple support for enumerations, allow non-printable objects [#12](https://github.com/CLIUtils/CLI11/issues/12)
 * Added `app.parse_order()` with original parse order ([#13](https://github.com/CLIUtils/CLI11/issues/13), [#16](https://github.com/CLIUtils/CLI11/pull/16)) 
 * Added `prefix_command()`, which is like `allow_extras` but instantly stops and returns. ([#8](https://github.com/CLIUtils/CLI11/issues/8), [#17](https://github.com/CLIUtils/CLI11/pull/17)) 
-* Removed Windows error ([#10](https://github.com/CLIUtils/CLI11/issues/10), [#20](https://github.com/CLIUtils/CLI11/pull/20))
+* Removed Windows warning ([#10](https://github.com/CLIUtils/CLI11/issues/10), [#20](https://github.com/CLIUtils/CLI11/pull/20))
 * Some improvements to CMake, detect Python and no dependencies on Python 2 (like Python 3) ([#18](https://github.com/CLIUtils/CLI11/issues/18), [#21](https://github.com/CLIUtils/CLI11/pull/21))
 
 ## Version 1.0