SS3 Small Fixes