diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index 199091305c..3640ee154b 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -223,6 +223,7 @@ foreach my $header (@ARGV)
 
 	# XXX These catalogs were not covered by the previous hand-maintained table.
 	my @skip = qw(
+		AttributeRelationId
 		AttrDefaultRelationId EnumRelationId IndexRelationId
 		LargeObjectRelationId ParameterAclRelationId
 		PublicationNamespaceRelationId PublicationRelRelationId
@@ -235,8 +236,6 @@ foreach my $header (@ARGV)
 		SecLabelRelationId SharedSecLabelRelationId
 		PartitionedRelationId RangeRelationId SequenceRelationId
 		SubscriptionRelRelationId);
-	# XXX This one neither, but if I add it to @skip, PerfectHash will fail. (???)
-	#FIXME: AttributeRelationId
 
 	# XXX hardcoded ObjectType mapping -- where to put this?
 	my %objtypes = (
diff --git a/src/tools/PerfectHash.pm b/src/tools/PerfectHash.pm
index e54905a3ef..f343661859 100644
--- a/src/tools/PerfectHash.pm
+++ b/src/tools/PerfectHash.pm
@@ -200,7 +200,8 @@ sub _construct_hash_table
 	# can be rejected due to touching unused hashtable entries.  In practice,
 	# neither effect seems strong enough to justify using a larger table.)
 	my $nedges = scalar @keys;       # number of edges
-	my $nverts = 2 * $nedges + 1;    # number of vertices
+	# WIP for object properties
+	my $nverts = 2 * $nedges + 3;    # number of vertices
 
 	# However, it would be very bad if $nverts were exactly equal to either
 	# $hash_mult1 or $hash_mult2: effectively, that hash function would be