Fix statics