Fixing Travis CI failures