diff --git a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java
index 5e0cb7a7eb..c9f6e18802 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java
@@ -40,7 +40,7 @@ public class AdempiereComboPopup extends BasicComboPopup
 	 *  Constructor
 	 *  @param combo
 	 */
-	public AdempiereComboPopup(JComboBox<?> combo)
+	public AdempiereComboPopup(JComboBox<Object> combo)
 	{
 		super(combo);
 	}   //  AdempiereComboPopup
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java
index d2090577be..feea16bb03 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java
@@ -302,7 +302,7 @@ public class VStatementCreateFromBatch extends StatementCreateFromBatch implemen
 				m_frame.getGridTab()));
 	}
 	
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		form.getMiniTable().getModel().removeTableModelListener(form);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java
index 4846481808..f7402def27 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java
@@ -306,7 +306,7 @@ public class VCreateFromDepositBatchUI extends CreateFromDepositBatch implements
 				documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getText()));
 	}
 	
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
index 7206955c04..2f9ecb718e 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
@@ -360,7 +360,7 @@ public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionLis
 	 *  Load Order/Invoice/Shipment data into Table
 	 *  @param data data
 	 */
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java
index 44ede962c2..277aa3e9ca 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java
@@ -80,7 +80,7 @@ public class VCreateFromPackageShipmentUI extends CreateFromPackageShipment
 		return true;
 	}
 	
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
index b41b3b642c..5be14d89a0 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
@@ -172,7 +172,7 @@ public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeLis
 	 *  Load Order/Invoice/Shipment data into Table
 	 *  @param data data
 	 */
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
index 842ba9bb96..6d6b0bf4f8 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
@@ -423,7 +423,7 @@ public class VCreateFromShipmentUI extends CreateFromShipment implements ActionL
 	 *  Load Order/Invoice/Shipment data into Table
 	 *  @param data data
 	 */
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
index 252df438b0..aa6eac8506 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
@@ -304,7 +304,7 @@ public class VCreateFromStatementUI extends CreateFromStatement implements Actio
 				documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getText()));
 	}
 	
-	protected void loadTableOIS (Vector<?> data)
+	protected void loadTableOIS (Vector<? extends Vector> data)
 	{
 		//  Remove previous listeners
 		dialog.getMiniTable().getModel().removeTableModelListener(dialog);
diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java
index a73c2abfd6..e30a6816bd 100644
--- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java
+++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java
@@ -39,7 +39,7 @@ public class CompiereComboPopup extends BasicComboPopup
 	 *  Constructor
 	 *  @param combo
 	 */
-	public CompiereComboPopup(JComboBox<?> combo)
+	public CompiereComboPopup(JComboBox<Object> combo)
 	{
 		super(combo);
 	}   //  AdempiereComboPopup