Fix more instances to be static