fix some var decls