More tweaks for SSI.