Fix more statics errors