Starting to fix some Travis issues