Small changes for SIIEv3