diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 9f2bfb02c5..837b7f632b 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.47 2000/11/30 18:38:45 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.48 2000/12/07 02:00:47 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -229,8 +229,10 @@ nocache_index_getattr(IndexTuple tup,
 		 *		check to see if desired att is null
 		 * ----------------
 		 */
-		bp = (char *) tup + sizeof(*tup);		/* "knows" t_bits are
-												 * here! */
+
+		/* XXX "knows" t_bits are just after fixed tuple header! */
+		bp = (bits8 *) ((char *) tup + sizeof(*tup));
+
 #ifdef IN_MACRO
 /* This is handled in the macro */
 
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 7adcba96a8..c95ee99b94 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.153 2000/12/03 20:45:39 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.154 2000/12/07 02:04:30 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2206,7 +2206,9 @@ pqPacketSend(PGconn *conn, const char *buf, size_t len)
 
 #define MAXBUFSIZE 256
 
-int parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage) {
+static int
+parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
+{
   char *service = conninfo_getval(options, "service");
   char *serviceFile = SYSCONFDIR "/pg_service.conf";
   int  group_found = 0;