Fixes for SS3.1