diff --git a/src/web/core/src/main/java/org/geoserver/web/data/importer/LayerResource.java b/src/web/core/src/main/java/org/geoserver/web/data/importer/LayerResource.java
index 2d58a81f33b..41950963f30 100644
--- a/src/web/core/src/main/java/org/geoserver/web/data/importer/LayerResource.java
+++ b/src/web/core/src/main/java/org/geoserver/web/data/importer/LayerResource.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -17,6 +17,8 @@
  */
 public class LayerResource implements Comparable<LayerResource>, Serializable {
     
+    private static final long serialVersionUID = 7584589248746230483L;
+
     enum LayerStatus {ERROR, NEWLY_PUBLISHED, UPDATED, NEW, PUBLISHED}; 
 
     /**
diff --git a/src/web/core/src/main/java/org/geoserver/web/data/importer/WMSLayerImporterPage.java b/src/web/core/src/main/java/org/geoserver/web/data/importer/WMSLayerImporterPage.java
index 970d11a52e4..8d050e89627 100644
--- a/src/web/core/src/main/java/org/geoserver/web/data/importer/WMSLayerImporterPage.java
+++ b/src/web/core/src/main/java/org/geoserver/web/data/importer/WMSLayerImporterPage.java
@@ -1,4 +1,4 @@
-/* (c) 2014 - 2015 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
@@ -39,15 +39,15 @@
 
 public class WMSLayerImporterPage extends GeoServerSecuredPage {
 
+    private static final long serialVersionUID = -3413451886777414860L;
     String storeId;
     private GeoServerTablePanel<LayerResource> layers;
     private WMSLayerProvider provider;
     int importCount;
     int errorCount;
     int updateCount;
-    private Form form;
+    private Form<WMSLayerImporterPage> form;
     
-    @SuppressWarnings({ "serial", "unchecked", "rawtypes" })
     public WMSLayerImporterPage(PageParameters params) {
         
         storeId = params.get("storeId").toString();
@@ -64,13 +64,15 @@ public WMSLayerImporterPage(PageParameters params) {
         }
 
         // build the GUI
-        form = new Form("form", new CompoundPropertyModel(this));
+        form = new Form<WMSLayerImporterPage>("form", new CompoundPropertyModel<WMSLayerImporterPage>(this));
         form.setOutputMarkupId(true);
         add(form);
         layers = new GeoServerTablePanel<LayerResource>("layerChooser", provider, true) {
 
+            private static final long serialVersionUID = -5817898784100419973L;
+
             @Override
-            protected Component getComponentForProperty(String id, IModel itemModel,
+            protected Component getComponentForProperty(String id, IModel<LayerResource> itemModel,
                     Property<LayerResource> property) {
                 if (property == WMSLayerProvider.NAME) {
                     return new Label(id, property.getModel(itemModel));
@@ -104,8 +106,10 @@ protected Component getComponentForProperty(String id, IModel itemModel,
         
     }
     
-    SimpleAjaxLink resourceChooserLink(String id, IModel itemModel, IModel label) {
-        return new SimpleAjaxLink(id, itemModel, label) {
+    SimpleAjaxLink<LayerResource> resourceChooserLink(String id, IModel<LayerResource> itemModel, IModel<?> label) {
+        return new SimpleAjaxLink<LayerResource>(id, itemModel, label) {
+
+            private static final long serialVersionUID = 163167608296661157L;
 
             @Override
             protected void onClick(AjaxRequestTarget target) {
@@ -136,6 +140,8 @@ LayerInfo buildLayerInfo(LayerResource resource) {
     AjaxSubmitLink submitLink() {
         return new AjaxSubmitLink("import") {
 
+            private static final long serialVersionUID = -7161320029912723242L;
+
             @Override
             protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                 try {
@@ -181,6 +187,8 @@ void publishLayers(List<LayerResource> selection) {
     AjaxSubmitLink importAllLink() {
         return new AjaxSubmitLink("importAll") {
 
+            private static final long serialVersionUID = 7089389540839181808L;
+
             @Override
             protected void onSubmit(AjaxRequestTarget target, Form<?> form) {                
                 try {
@@ -255,22 +263,23 @@ private void createImportReport(){
         }
     }
     
-    final class StatusModel implements IModel {
+    final class StatusModel implements IModel<String> {
         
-        IModel layerResource;
+        private static final long serialVersionUID = 7754149365712750847L;
+        IModel<LayerResource> layerResource;
         
-        public StatusModel(IModel layerResource) {
+        public StatusModel(IModel<LayerResource> layerResource) {
             super();
             this.layerResource = layerResource;
         }
 
-        public Object getObject() {
+        public String getObject() {
             LayerResource resource = (LayerResource) layerResource.getObject();
                 return new ParamResourceModel("WMSLayerImporterPage.status." + resource.getStatus(), 
                         WMSLayerImporterPage.this, resource.getError()).getString();
         }
 
-        public void setObject(Object object) {
+        public void setObject(String object) {
             throw new UnsupportedOperationException();
         }
 
@@ -280,15 +289,16 @@ public void detach() {
         
     }
     
-    final class IconModel implements IModel {
+    final class IconModel implements IModel<PackageResourceReference> {
         
-        IModel layerResource;
+        private static final long serialVersionUID = 5762710251083186192L;
+        IModel<LayerResource> layerResource;
         
-        public IconModel(IModel layerResource) {
+        public IconModel(IModel<LayerResource> layerResource) {
             this.layerResource = layerResource;
         }
 
-        public Object getObject() {
+        public PackageResourceReference getObject() {
             LayerResource resource = (LayerResource) layerResource.getObject();
             if(resource.getStatus() == LayerStatus.ERROR) {
                 return new PackageResourceReference(
@@ -308,7 +318,7 @@ public Object getObject() {
             }
         }
 
-        public void setObject(Object object) {
+        public void setObject(PackageResourceReference object) {
             throw new UnsupportedOperationException();
         }
 
@@ -317,7 +327,4 @@ public void detach() {
         }
         
     }
-    
-    
-    
 }