Fix class var warnings