diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java b/DataModel/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
index 13c91ab436..5f8706b5e2 100644
--- a/DataModel/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
+++ b/DataModel/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
@@ -29,7 +29,8 @@ import org.openide.nodes.PropertySupport;
 class NodeProperty extends PropertySupport.ReadOnly {
 
     private Object value;
-
+    
+    @SuppressWarnings({"unchecked"})
     NodeProperty(String name, String displayName, String desc, Object value) {
         super(name, value.getClass(), displayName, desc);
         setValue("suppressCustomEditor", Boolean.TRUE); // remove the "..." (editing) button
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java b/DataModel/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java
index 020a77799e..c34e055719 100644
--- a/DataModel/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java
+++ b/DataModel/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java
@@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
  * list of root Content objects for the tree.
  */
 public class RootContentChildren extends AbstractContentChildren {
-    private Collection contentKeys;
+    private Collection<? extends Object> contentKeys;
     
     /**
      * @param contentKeys root Content objects for the Node tree