diff --git a/contrib/babelfishpg_tsql/src/guc.c b/contrib/babelfishpg_tsql/src/guc.c
index 28cab6b324f..96bedc53bb9 100644
--- a/contrib/babelfishpg_tsql/src/guc.c
+++ b/contrib/babelfishpg_tsql/src/guc.c
@@ -607,7 +607,7 @@ assign_temp_oid_buffer_size(int newval, void *extra)
 	if (pltsql_protocol_plugin_ptr && *pltsql_protocol_plugin_ptr && (*pltsql_protocol_plugin_ptr)->set_guc_stat_var)
 	{
 		(*pltsql_protocol_plugin_ptr)->set_guc_stat_var("babelfishpg_tsql.temp_oid_buffer_size", false, NULL, newval);
-		temp_oid_buffer_start = InvalidOid;//(double) 
+		temp_oid_buffer_start = InvalidOid;
 	}
 }
 
@@ -1133,7 +1133,7 @@ define_custom_variables(void)
 							gettext_noop("Internal. Specifies the start range of the buffer for temp oids"),
 							NULL,
 							&temp_oid_buffer_start,
-							InvalidOid, 0, INT_MAX, // Eventually set to OID_MAX
+							InvalidOid, INT_MIN, INT_MAX, /* Add INT_MIN to size, since Oid is uint32. */
 							PGC_INTERNAL,
 							GUC_NOT_IN_SAMPLE,
 							NULL, NULL, NULL);
@@ -1142,7 +1142,7 @@ define_custom_variables(void)
 							gettext_noop("Temp oid buffer size"),
 							NULL,
 							&temp_oid_buffer_size,
-							65536, 1, 131072, /* What should the max size be? */
+							16384, 1, 65536,
 							PGC_USERSET,
 							GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE | GUC_DISALLOW_IN_AUTO_FILE,
 							NULL, assign_temp_oid_buffer_size, NULL);