Update RI params for new set
Fix problem with translating `include` for batch