First batch of Travis fixes