Fix Class vars