diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WButtonEditor.java b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WButtonEditor.java
index 5a709fb463..07c0ab9e91 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WButtonEditor.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WButtonEditor.java
@@ -269,7 +269,9 @@ public class WButtonEditor extends WEditor
 		if (Events.ON_CLICK.equals(event.getName()))
 		{
 			ActionEvent actionEvent = new ActionEvent(this, getColumnName(), Events.ON_CLICK);
-			for (ActionListener evtListener : actionListeners)
+			ActionListener[] listeners = new ActionListener[0];
+			listeners = actionListeners.toArray(listeners);
+			for (ActionListener evtListener : listeners)
 			{
 				evtListener.actionPerformed(actionEvent);
 			}
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
index e1235abebd..f7652f4d5f 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
@@ -38,7 +38,8 @@ import org.zkoss.zk.ui.event.Events;
 public class WDateEditor extends WEditor
 {
 	private static final String[] LISTENER_EVENTS = {Events.ON_CHANGE};
-    private static final CLogger logger;
+    @SuppressWarnings("unused")
+	private static final CLogger logger;
     
     static
     {
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
index 8636e5c9dd..a9992dc5ff 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java
@@ -30,7 +30,8 @@ import org.zkoss.zk.ui.event.Events;
 public class WDatetimeEditor extends WEditor
 {
 	private static final String[] LISTENER_EVENTS = {Events.ON_CHANGE};
-    private static final CLogger logger;
+    @SuppressWarnings("unused")
+	private static final CLogger logger;
     
     static
     {
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java
index edb167be3c..b9d4e4c667 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditorPopupMenu.java
@@ -133,7 +133,9 @@ public class WEditorPopupMenu extends Menupopup implements EventListener
         {
             ContextMenuEvent menuEvent = new ContextMenuEvent(evt);
             
-            for (ContextMenuListener listener : menuListeners)
+            ContextMenuListener[] listeners = new ContextMenuListener[0];
+            listeners = menuListeners.toArray(listeners);
+            for (ContextMenuListener listener : listeners)
             {
                 listener.onMenu(menuEvent);
             }
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
index b926389b3b..20c10851f8 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/WImageDialog.java
@@ -71,6 +71,17 @@ public class WImageDialog extends Window implements EventListener
 		//  load data
 		if (m_mImage == null)
 			m_mImage = MImage.get (Env.getCtx(), 0);
+		else
+		{
+			try {
+				AImage aImage = new AImage(m_mImage.getName(), m_mImage.getData());
+				
+				image.setContent(aImage);
+			} catch (Exception e) {
+				log.log(Level.WARNING, "load image", e);
+			}
+		}
+		
 		fileButton.setLabel(m_mImage.getName());
 //		imageLabel.setIcon(m_mImage.getIcon());
 		AEnv.showCenterScreen(this);
@@ -172,7 +183,6 @@ public class WImageDialog extends Window implements EventListener
 		}
 
 		String fileName = imageFile.getName();
-		byte[] data = null;
 		
 		//  See if we can load & display it
 		try
@@ -197,7 +207,7 @@ public class WImageDialog extends Window implements EventListener
 		//  Save info
 		m_mImage.setName(fileName);
 		m_mImage.setImageURL(fileName);
-		m_mImage.setBinaryData(data);
+		m_mImage.setBinaryData(image.getContent().getByteData());
 	}   //  cmd_file
 
 	/**