Travis fixes, part 2