Updates to attempt to fix travis 3