diff --git a/xflaim/java/util/XEdit/xedit/Attribute.java b/xflaim/java/util/XEdit/xedit/Attribute.java
index 53e267e..f96681c 100644
--- a/xflaim/java/util/XEdit/xedit/Attribute.java
+++ b/xflaim/java/util/XEdit/xedit/Attribute.java
@@ -24,6 +24,7 @@
 //------------------------------------------------------------------------------
 
 package xedit;
+import xflaim.*;
 
 /**
  * To change the template for this generated type comment go to
diff --git a/xflaim/java/util/XEdit/xedit/CollectionSelector.java b/xflaim/java/util/XEdit/xedit/CollectionSelector.java
index 27a320c..36a172a 100644
--- a/xflaim/java/util/XEdit/xedit/CollectionSelector.java
+++ b/xflaim/java/util/XEdit/xedit/CollectionSelector.java
@@ -94,7 +94,7 @@ public class CollectionSelector extends JDialog implements ActionListener
 							KeyRetrieveFlags.FO_FIRST,
 							SearchKey);
 			
-			SearchKey.setUINT(0, ReserveID.ELM_COLLECTION_TAG);
+			SearchKey.setLong(0, ReserveID.ELM_COLLECTION_TAG);
 			SearchKey.setString(1, "a");
 			
 			for (;;)
@@ -118,12 +118,12 @@ public class CollectionSelector extends JDialog implements ActionListener
 					break;
 				}
 				
-				if (FoundKey.getUINT(0) != ReserveID.ELM_COLLECTION_TAG)
+				if (FoundKey.getLong(0) != ReserveID.ELM_COLLECTION_TAG)
 				{
 					break;
 				}
 				String sName = FoundKey.getString(1);
-				int iNumber = FoundKey.getINT(3);
+				int iNumber = (int)FoundKey.getLong(3);
 				vCollections.add(new Collection(sName, iNumber));
 				
 			}
diff --git a/xflaim/java/util/XEdit/xedit/FileImporter.java b/xflaim/java/util/XEdit/xedit/FileImporter.java
index 63340f4..7d9bada 100644
--- a/xflaim/java/util/XEdit/xedit/FileImporter.java
+++ b/xflaim/java/util/XEdit/xedit/FileImporter.java
@@ -95,7 +95,7 @@ public class FileImporter extends Thread
 		String []		sList)
 	{
 		boolean				bTransBegun = false;
-		PosIStream 			jIStream = null;
+		IStream 				jIStream = null;
 		
 		if (m_box.Cancelled())
 		{
diff --git a/xflaim/java/util/XEdit/xedit/NodeDialog.java b/xflaim/java/util/XEdit/xedit/NodeDialog.java
index a192c3f..afc35f6 100644
--- a/xflaim/java/util/XEdit/xedit/NodeDialog.java
+++ b/xflaim/java/util/XEdit/xedit/NodeDialog.java
@@ -615,7 +615,7 @@ public class NodeDialog extends JDialog implements Runnable, ActionListener, Lis
 							  KeyRetrieveFlags.FO_FIRST,
 							  SearchKey);
 			
-			SearchKey.setUINT(0, ReserveID.ELM_ELEMENT_TAG);
+			SearchKey.setLong(0, ReserveID.ELM_ELEMENT_TAG);
 			SearchKey.setString(1, "a");
 			
 			for (;;)
@@ -639,12 +639,12 @@ public class NodeDialog extends JDialog implements Runnable, ActionListener, Lis
 					break;
 				}
 				
-				if (FoundKey.getUINT(0) != ReserveID.ELM_ELEMENT_TAG)
+				if (FoundKey.getLong(0) != ReserveID.ELM_ELEMENT_TAG)
 				{
 					break;
 				}
 				String sName = FoundKey.getString(1);
-				int iNumber = FoundKey.getINT(3);
+				int iNumber = (int)FoundKey.getLong(3);
 				vElements.add(new NodeTag("<" + sName + ">", iNumber));
 			}
 			
@@ -695,7 +695,7 @@ public class NodeDialog extends JDialog implements Runnable, ActionListener, Lis
 							  KeyRetrieveFlags.FO_FIRST,
 							  SearchKey);
 			
-			SearchKey.setUINT(0, ReserveID.ELM_ATTRIBUTE_TAG);
+			SearchKey.setLong(0, ReserveID.ELM_ATTRIBUTE_TAG);
 			SearchKey.setString(1, "a");
 			
 			for (;;)
@@ -719,12 +719,12 @@ public class NodeDialog extends JDialog implements Runnable, ActionListener, Lis
 					break;
 				}
 				
-				if (FoundKey.getUINT(0) != ReserveID.ELM_ATTRIBUTE_TAG)
+				if (FoundKey.getLong(0) != ReserveID.ELM_ATTRIBUTE_TAG)
 				{
 					break;
 				}
 				String sName = FoundKey.getString(1);
-				int iNumber = FoundKey.getINT(3);
+				int iNumber = (int)FoundKey.getLong(3);
 				vAttributes.add(new NodeTag("<" + sName + ">", iNumber));
 			}
 			
diff --git a/xflaim/java/util/XEdit/xedit/XEdit.java b/xflaim/java/util/XEdit/xedit/XEdit.java
index c3a94a2..80324c0 100644
--- a/xflaim/java/util/XEdit/xedit/XEdit.java
+++ b/xflaim/java/util/XEdit/xedit/XEdit.java
@@ -1400,7 +1400,18 @@ public class XEdit extends JFrame implements Runnable, ActionListener, MouseList
 		if (sDatabaseName != null)
 		{
 			// If this fails, we will throw an exception.
-			m_dbSystem.dbRemove( sDatabaseName, "", "", true);
+			try
+			{
+				m_dbSystem.dbRemove( sDatabaseName, "", "", true);
+			}
+			catch (XFlaimException e)
+			{
+				JOptionPane.showConfirmDialog(
+					this,
+					"Database Exception occurred: " + e.getMessage(),
+					"Database Exception",
+					JOptionPane.ERROR_MESSAGE);
+			}
 		}
 	}