Updates to attempt to fix travis 2