diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
index b9847081db..457be26c4e 100644
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -33,8 +33,7 @@ lo_manage(PG_FUNCTION_ARGS)
 	HeapTuple	trigtuple;		/* The original value of tuple	*/
 
 	if (!CALLED_AS_TRIGGER(fcinfo)) /* internal error */
-		elog(ERROR, "%s: not fired by trigger manager",
-			 trigdata->tg_trigger->tgname);
+		elog(ERROR, "lo_manage: not fired by trigger manager");
 
 	if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event)) /* internal error */
 		elog(ERROR, "%s: must be fired for row",
diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c
index 20dee11909..fc19307bf2 100644
--- a/src/backend/commands/constraint.c
+++ b/src/backend/commands/constraint.c
@@ -40,7 +40,7 @@
 Datum
 unique_key_recheck(PG_FUNCTION_ARGS)
 {
-	TriggerData *trigdata = castNode(TriggerData, fcinfo->context);
+	TriggerData *trigdata = (TriggerData *) fcinfo->context;
 	const char *funcname = "unique_key_recheck";
 	ItemPointerData checktid;
 	ItemPointerData tmptid;