Travis setup script fixes