Potential workarounds to fix Travis issues