VarDecl and ClassDecl fix