Updates to attempt to fix travis