Add SpecialSessionComponent, minor fixes