Fix tuple bug
Fix null pointer in var decl