Fix more messed up class member variables.