Fixes for Travis CI