mc-soi

diff --git a/src/www_fdw.c b/src/www_fdw.c
index ad095d1..23a7fce 100755
--- a/src/www_fdw.c
+++ b/src/www_fdw.c
@@ -652,7 +652,8 @@ www_get_foreign_plan(PlannerInfo *root,
 							scan_clauses,
 							scan_relid,
 							NIL, /* no expressions to evaluate */
-							NIL); /* no private state either */
+							NIL, /* no private state either */

mc-soi

diff --git a/src/tds_fdw.c b/src/tds_fdw.c
index 6bbf28f..b6909ee 100644
--- a/src/tds_fdw.c
+++ b/src/tds_fdw.c
@@ -1746,7 +1746,7 @@ ForeignScan* tdsGetForeignPlan(PlannerInfo *root, RelOptInfo *baserel,
 			));
 	#endif
 	
-	return make_foreignscan(tlist, scan_clauses, scan_relid, NIL, NIL);
+	return make_foreignscan(tlist, scan_clauses, scan_relid, NIL, NIL, NIL);

mc-soi

diff --git a/pljava-so/src/main/c/type/AclId.c b/pljava-so/src/main/c/type/AclId.c
index 5d36817..c137e77 100644
--- a/pljava-so/src/main/c/type/AclId.c
+++ b/pljava-so/src/main/c/type/AclId.c
@@ -177,7 +177,7 @@ Java_org_postgresql_pljava_internal_AclId__1getName(JNIEnv* env, jobject aclId)
 	BEGIN_NATIVE
 	PG_TRY();
 	{
-		result = String_createJavaStringFromNTS(GetUserNameFromId(AclId_getAclId(aclId)));
+		result = String_createJavaStringFromNTS(GetUserNameFromId(AclId_getAclId(aclId), false));

mc-soi

diff --git a/JDBC1DriverLoader.java b/JDBC1DriverLoader.java
index 4ccc8f1..31969db 100644
--- a/JDBC1DriverLoader.java
+++ b/JDBC1DriverLoader.java
@@ -9,7 +9,7 @@
  * Author: Atri Sharma <atri.jiit@gmail.com>
  *
  * IDENTIFICATION
- *		  jdbc_fdw/JDBCDriverLoader.java
+ *		  jdbc_fdw/JDBC1DriverLoader.java

mc-soi

diff --git a/jdbc2_fdw.c b/jdbc2_fdw.c
index a4a89d9..a194808 100644
--- a/jdbc2_fdw.c
+++ b/jdbc2_fdw.c
@@ -716,7 +716,8 @@ jdbcGetForeignPlan(PlannerInfo *root,
                             local_exprs,
                             scan_relid,
                             params_list,
-                            fdw_private);
+                            fdw_private,

mc-soi

diff --git a/ifx_fdw.c b/ifx_fdw.c
index fab4df8..4d83ee4 100644
--- a/ifx_fdw.c
+++ b/ifx_fdw.c
@@ -1829,13 +1829,15 @@ static void ifxPrepareParamsForModify(IfxFdwExecutionState *state,
 			 * Shamelessly stolen from src/contrib/postgres_fdw.
 			 */
 			RangeTblEntry *rte = planner_rt_fetch(resultRelation, planInfo);
-			Bitmapset  *tmpset = bms_copy(rte->modifiedCols);
-			AttrNumber	col;