Update statics to private for SS3.1+