Now using Config rather than updating statics directly
Fix for stricter static method warnings