diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form
index 88c36cd4c3..1042b934b3 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form
@@ -103,6 +103,9 @@
           <StringArray count="0"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JCheckBox" name="noFatOrphansCheckbox">
       <Properties>
@@ -200,6 +203,9 @@
               <StringArray count="0"/>
             </Property>
           </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;ContentTypePanel&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java
index b1fa10a603..4aa6de6740 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java
@@ -57,7 +57,7 @@ final class AddImageVisualPanel1 extends JPanel {
     private AddImageWizardPanel1 wizPanel;
     private ContentTypeModel model;
     
-    ContentTypePanel currentPanel;
+    private ContentTypePanel currentPanel;
 
     /**
      * Creates new form AddImageVisualPanel1
@@ -231,13 +231,13 @@ final class AddImageVisualPanel1 extends JPanel {
         jLabel2 = new javax.swing.JLabel();
         nextLabel = new javax.swing.JLabel();
         timeZoneLabel = new javax.swing.JLabel();
-        timeZoneComboBox = new javax.swing.JComboBox();
+        timeZoneComboBox = new javax.swing.JComboBox<String>();
         noFatOrphansCheckbox = new javax.swing.JCheckBox();
         descLabel = new javax.swing.JLabel();
         inputPanel = new javax.swing.JPanel();
         typeTabel = new javax.swing.JLabel();
         typePanel = new javax.swing.JPanel();
-        typeComboBox = new javax.swing.JComboBox();
+        typeComboBox = new javax.swing.JComboBox<ContentTypePanel>();
         imgInfoLabel = new javax.swing.JLabel();
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(AddImageVisualPanel1.class, "AddImageVisualPanel1.jLabel2.text")); // NOI18N
@@ -355,9 +355,9 @@ final class AddImageVisualPanel1 extends JPanel {
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel nextLabel;
     private javax.swing.JCheckBox noFatOrphansCheckbox;
-    private javax.swing.JComboBox timeZoneComboBox;
+    private javax.swing.JComboBox<String> timeZoneComboBox;
     private javax.swing.JLabel timeZoneLabel;
-    private javax.swing.JComboBox typeComboBox;
+    private javax.swing.JComboBox<ContentTypePanel> typeComboBox;
     private javax.swing.JPanel typePanel;
     private javax.swing.JLabel typeTabel;
     // End of variables declaration//GEN-END:variables
@@ -377,9 +377,10 @@ final class AddImageVisualPanel1 extends JPanel {
     /**
      * ComboBoxModel to control typeComboBox and supply ImageTypePanels.
      */
-    private class ContentTypeModel implements ComboBoxModel {
-        ContentTypePanel selected;
-        ContentTypePanel[] types = ContentTypePanel.getPanels();
+    private class ContentTypeModel implements ComboBoxModel<ContentTypePanel> {
+        private ContentTypePanel selected;
+        private ContentTypePanel[] types = ContentTypePanel.getPanels();
+        
         
         @Override
         public void setSelectedItem(Object anItem) {
@@ -398,7 +399,7 @@ final class AddImageVisualPanel1 extends JPanel {
         }
 
         @Override
-        public Object getElementAt(int index) {
+        public ContentTypePanel getElementAt(int index) {
             return types[index];
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
index 4b8e20064a..0331635a9d 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
@@ -75,7 +75,7 @@ public final class CasePropertiesAction extends CallableSystemAction {
             int totalImage = currentCase.getRootObjectsCount();
 
             // put the image paths information into hashmap
-            Map<Long, String> imgPaths = currentCase.getImagePaths(currentCase.getSleuthkitCase());
+            Map<Long, String> imgPaths = Case.getImagePaths(currentCase.getSleuthkitCase());
 
             // create the case properties form
             CasePropertiesForm cpf = new CasePropertiesForm(currentCase, crDate, caseDir, imgPaths);