Improve TravisCI build