diff --git a/pg_variables.c b/pg_variables.c
index c8ee939..e07395a 100644
--- a/pg_variables.c
+++ b/pg_variables.c
@@ -122,7 +122,6 @@ do { \
 #endif							/* PG_VERSION_NUM */
 
 /* User controlled GUCs */
-bool convert_unknownoid_guc;
 bool convert_unknownoid;
 
 static HTAB *packagesHash = NULL;
diff --git a/pg_variables.h b/pg_variables.h
index 6508e9f..abd5166 100644
--- a/pg_variables.h
+++ b/pg_variables.h
@@ -204,8 +204,14 @@ extern bool removeObject(TransObject *object, TransObjectType type);
 #define GetPackState(package) \
 	(((PackState *) GetActualState(package)))
 
+#if PG_VERSION_NUM >= 190000
+#define GetName(object) \
+	(StaticAssertVariableIsOfTypeMacro(object->transObject, TransObject), \
+	 object->transObject.name)
+#else
 #define GetName(object) \
 	(AssertVariableIsOfTypeMacro(object->transObject, TransObject), \
 	 object->transObject.name)
+#endif
 
 #endif							/* __PG_VARIABLES_H__ */
diff --git a/pg_variables_record.c b/pg_variables_record.c
index e3567d1..080af36 100644
--- a/pg_variables_record.c
+++ b/pg_variables_record.c
@@ -390,7 +390,7 @@ get_record_key(Datum tuple, TupleDesc tupdesc, bool *isnull)
 {
 	HeapTupleHeader th = (HeapTupleHeader) DatumGetPointer(tuple);
 	bool		hasnulls = th->t_infomask & HEAP_HASNULL;
-	bits8	   *bp = th->t_bits;	/* ptr to null bitmap in tuple */
+	uint8_t	   *bp = th->t_bits;	/* ptr to null bitmap in tuple */
 	char	   *tp;				/* ptr to tuple data */
 	long		off;			/* offset in tuple data */
 	int			keyatt = 0;