More tweaks for Travis dependencies.