More SCI fixes.