Fix deprecation warnings for master

Mark various statics as private