Fix Travis CI failures