Fix more static