fixes for the new ss3.0.5