diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index fd9c3c95d36b28447f18b613cb331d7d86a72db9..0c487bc2496b357a5536819db17d5353dd33416a 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.64 1998/11/27 19:51:49 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.65 1998/12/13 04:37:50 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -649,7 +649,7 @@ AppendAttributeTuples(Relation indexRelation, int numatts)
 	value[Anum_pg_attribute_attcacheoff - 1] = Int32GetDatum(-1);
 
 	init_tuple = heap_addheader(Natts_pg_attribute,
-								sizeof *(indexRelation->rd_att->attrs[0]),
+				    ATTRIBUTE_TUPLE_SIZE,
 							 (char *) (indexRelation->rd_att->attrs[0]));
 
 	hasind = false;
@@ -689,7 +689,7 @@ AppendAttributeTuples(Relation indexRelation, int numatts)
 		 */
 		memmove(GETSTRUCT(cur_tuple),
 				(char *) indexTupDesc->attrs[i],
-				sizeof(FormData_pg_attribute));
+			        ATTRIBUTE_TUPLE_SIZE);
 
 		value[Anum_pg_attribute_attnum - 1] = Int16GetDatum(i + 1);
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 9382d4a7dcba77f10d00a04c74eb763eae10b4ba..293d50a49031593171ce0ea466a61beacc61202e 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.38 1998/12/04 15:34:29 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.39 1998/12/13 04:37:51 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -5224,7 +5224,7 @@ fmtId(char *rawid)
 		if (! (islower(*cp) || isdigit(*cp) || (*cp == '_'))) break;
 
 	if (*cp != '\0') {
-		cp = palloc(strlen(rawid)+1);
+		cp = palloc(strlen(rawid)+3);
 		strcpy(cp,"\"");
 		strcat(cp,rawid);
 		strcat(cp,"\"");