Gateway fixes. Add RSF for CIA generation.