Fixed class var references.