SS3 compatibility and small fix