Fix some TravisCI build problems