Fix statics, add span to static and typedef