[#4821] - Fix some missing iids

First time contribution, please let me know if anything is badly done