Fixes for Travis CI to succeed.