diff --git a/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java b/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
index 104a77c6f6..70d7f64271 100755
--- a/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
@@ -528,25 +528,26 @@ public class X509Authentication implements AuthenticationMethod
 
         if (authenticated)
         {
-            List<String> groupNames = new ArrayList<String>();
+            List<String> groupNames = getX509Groups();
             List<Integer> groupIDs = new ArrayList<Integer>();
 
-            groupNames = getX509Groups();
-
-            for (String groupName : groupNames)
+            if (groupNames != null)
             {
-                if (groupName != null)
+                for (String groupName : groupNames)
                 {
-                    Group group = Group.findByName(context, groupName);
-                    if (group != null)
+                    if (groupName != null)
                     {
-                        groupIDs.add(Integer.valueOf(group.getID()));
-                    }
-                    else
-                    {
-                        log.warn(LogManager.getHeader(context,
-                                "configuration_error", "unknown_group="
-                                        + groupName));
+                        Group group = Group.findByName(context, groupName);
+                        if (group != null)
+                        {
+                            groupIDs.add(Integer.valueOf(group.getID()));
+                        }
+                        else
+                        {
+                            log.warn(LogManager.getHeader(context,
+                                    "configuration_error", "unknown_group="
+                                            + groupName));
+                        }
                     }
                 }
             }
diff --git a/dspace-api/src/main/java/org/dspace/search/DSIndexer.java b/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
index 61a5b8a903..f88ddfd8fb 100644
--- a/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
+++ b/dspace-api/src/main/java/org/dspace/search/DSIndexer.java
@@ -204,6 +204,7 @@ public class DSIndexer
                 {
                 case 3:
                     indexConfigArr[i].qualifier = parts[2];
+                    // Fall through for other parts of the array
                 case 2:
                     indexConfigArr[i].schema  = parts[0];
                     indexConfigArr[i].element = parts[1];
diff --git a/dspace-api/src/main/java/org/dspace/usage/UsageEvent.java b/dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
index 95a78e3ceb..89c922ddaf 100644
--- a/dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
+++ b/dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
@@ -78,11 +78,11 @@ public class UsageEvent extends Event {
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private HttpServletRequest request;
+	private transient HttpServletRequest request;
 	
-	private Context context;
+	private transient Context context;
 	
-	private DSpaceObject object;
+	private transient DSpaceObject object;
 
 	private Action action;
 			
diff --git a/dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java b/dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java
index 007ddd8453..f3f78faad0 100644
--- a/dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java
+++ b/dspace-api/src/main/java/org/dspace/workflow/WorkflowManager.java
@@ -1018,9 +1018,6 @@ public class WorkflowManager
     private static void recordStart(Context c, Item myitem)
             throws SQLException, IOException, AuthorizeException
     {
-        // Get non-internal format bitstreams
-        Bitstream[] bitstreams = myitem.getNonInternalBitstreams();
-
         // get date
         DCDate now = DCDate.getCurrent();
 
diff --git a/dspace-discovery/dspace-discovery-provider/src/main/java/org/dspace/discovery/SolrServiceImpl.java b/dspace-discovery/dspace-discovery-provider/src/main/java/org/dspace/discovery/SolrServiceImpl.java
index 43fb456e15..9563ac7ed1 100644
--- a/dspace-discovery/dspace-discovery-provider/src/main/java/org/dspace/discovery/SolrServiceImpl.java
+++ b/dspace-discovery/dspace-discovery-provider/src/main/java/org/dspace/discovery/SolrServiceImpl.java
@@ -804,7 +804,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                         } catch (Exception e) {
                             // this will never happen, but compiler is now
                             // happy.
-//                            log.error(e.getMessage(), e);
+                            log.trace(e.getMessage(), e);
                         }
                     }
                 }
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java
index 215e3a388b..4f5847c358 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/BrowseListTag.java
@@ -84,7 +84,7 @@ public class BrowseListTag extends TagSupport
     private static Logger log = Logger.getLogger(BrowseListTag.class);
 
     /** Items to display */
-    private BrowseItem[] items;
+    private transient BrowseItem[] items;
 
     /** Row to highlight, -1 for no row */
     private int highlightRow = -1;
@@ -125,7 +125,9 @@ public class BrowseListTag extends TagSupport
 
     private static int authorLimit = -1;
 
-    private BrowseInfo browseInfo;
+    private transient BrowseInfo browseInfo;
+
+    private static final long serialVersionUID = 8091584920304256107L;
 
     public BrowseListTag()
     {
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/CollectionListTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/CollectionListTag.java
index 1f3c18ddee..e8bfedfa93 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/CollectionListTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/CollectionListTag.java
@@ -59,7 +59,9 @@ import org.dspace.content.Collection;
 public class CollectionListTag extends TagSupport
 {
     /** Collections to display */
-    private Collection[] collections;
+    private transient Collection[] collections;
+
+    private static final long serialVersionUID = -9040013543196580904L;
 
     public CollectionListTag()
     {
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/CommunityListTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/CommunityListTag.java
index ecd29c7eaa..437f7a2360 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/CommunityListTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/CommunityListTag.java
@@ -60,7 +60,9 @@ import org.dspace.content.Community;
 public class CommunityListTag extends TagSupport
 {
     /** Communities to display */
-    private Community[] communities;
+    private transient Community[] communities;
+
+    private static final long serialVersionUID = 5788338729470292501L;
 
     public CommunityListTag()
     {
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/DateTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/DateTag.java
index 511b24f921..7d3596219d 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/DateTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/DateTag.java
@@ -58,11 +58,13 @@ import org.dspace.content.DCDate;
 public class DateTag extends TagSupport
 {
     /** The date to display */
-    private DCDate date;
+    private transient DCDate date;
 
     /** Display the time? */
     private boolean displayTime = true;
 
+    private static final long serialVersionUID = 6665825578727713535L;
+
     /**
      * Get the date
      * 
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java
index 08204b5ebf..0ac62ed378 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemListTag.java
@@ -93,7 +93,7 @@ public class ItemListTag extends TagSupport
     private static Logger log = Logger.getLogger(ItemListTag.class);
 
     /** Items to display */
-    private Item[] items;
+    private transient Item[] items;
 
     /** Row to highlight, -1 for no row */
     private int highlightRow = -1;
@@ -134,7 +134,9 @@ public class ItemListTag extends TagSupport
 
     private static int authorLimit = -1;
 
-    private SortOption sortOption = null;
+    private transient SortOption sortOption = null;
+
+    private static final long serialVersionUID = 348762897199116432L;
 
     public ItemListTag()
     {
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemPreviewTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemPreviewTag.java
index 99866cb163..62aee8637f 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemPreviewTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemPreviewTag.java
@@ -69,7 +69,9 @@ import javax.servlet.jsp.tagext.TagSupport;
 public class ItemPreviewTag extends TagSupport
 {
     /** Item to display */
-    private Item item;
+    private transient Item item;
+
+    private static final long serialVersionUID = -5535762797556685631L;
 
     public ItemPreviewTag()
     {
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java
index a24f13d010..020d4f355d 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java
@@ -213,10 +213,10 @@ public class ItemTag extends TagSupport
     private static final String DOI_DEFAULT_BASEURL = "http://dx.doi.org/";
 
     /** Item to display */
-    private Item item;
+    private transient Item item;
 
     /** Collections this item appears in */
-    private Collection[] collections;
+    private transient Collection[] collections;
 
     /** The style to use - "default" or "full" */
     private String style;
@@ -240,6 +240,8 @@ public class ItemTag extends TagSupport
     
     /** regex pattern to capture the style of a field, ie <code>schema.element.qualifier(style)</code> */
     private Pattern fieldStylePatter = Pattern.compile(".*\\((.*)\\)");
+
+    private static final long serialVersionUID = -3841266490729417240L;
     
     public ItemTag()
     {
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SFXLinkTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SFXLinkTag.java
index 35d4a67592..292cba5c58 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SFXLinkTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SFXLinkTag.java
@@ -62,12 +62,14 @@ public class SFXLinkTag extends TagSupport
 {
     /** Item to display SFX link for */
 
-    private Item item;
+    private transient Item item;
 
     /** The fully qualified pathname of the SFX  XML file */
     private String sfxFile = ConfigurationManager.getProperty("dspace.dir") + File.separator
     				+ "config" + File.separator + "sfx.xml";
 
+    private static final long serialVersionUID = 7028793612957710128L;
+
     public SFXLinkTag()
     {
         super();
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java
index 4f64853c75..63b627cc6a 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java
@@ -79,7 +79,9 @@ public class SelectEPersonTag extends TagSupport
     private boolean multiple;
 
     /** Which eperson/epeople are initially in the list? */
-    private EPerson[] epeople;
+    private transient EPerson[] epeople;
+
+    private static final long serialVersionUID = -7323789442034590853L;
 
     public SelectEPersonTag()
     {
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java
index 3990c87b09..40d5166343 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java
@@ -75,7 +75,9 @@ public class SelectGroupTag extends TagSupport
 	private boolean multiple;
 	
 	/** Which groups are initially in the list? */
-	private Group[] groups; 
+	private transient Group[] groups;
+
+    private static final long serialVersionUID = -3330389128849427302L; 
 
 
 	public SelectGroupTag()
diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/SimpleSearchServlet.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/SimpleSearchServlet.java
index 1a2c97dbdb..cb3051cb69 100644
--- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/SimpleSearchServlet.java
+++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/SimpleSearchServlet.java
@@ -107,7 +107,6 @@ public class SimpleSearchServlet extends DSpaceServlet
         String order = request.getParameter("order");
         int rpp = UIUtil.getIntParameter(request, "rpp");
         String advancedQuery = "";
-        Map<String, String> queryHash = new HashMap<String, String>();
 
         // can't start earlier than 0 in the results!
         if (start < 0)
@@ -402,11 +401,14 @@ public class SimpleSearchServlet extends DSpaceServlet
             request.setAttribute("communities", communities);
             request.setAttribute("no_results", "yes");
 
-            queryHash = qArgs.buildQueryMap(request);
+            Map<String, String> queryHash = qArgs.buildQueryMap(request);
 
-            for (Map.Entry<String, String> entry : queryHash.entrySet())
+            if (queryHash != null)
             {
-                request.setAttribute(entry.getKey(), entry.getValue());
+                for (Map.Entry<String, String> entry : queryHash.entrySet())
+                {
+                    request.setAttribute(entry.getKey(), entry.getValue());
+                }
             }
 
             JSPManager.showJSP(request, response, "/search/advanced.jsp");
diff --git a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVItem.java b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVItem.java
index 8c85625f0b..3f96c8e791 100644
--- a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVItem.java
+++ b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVItem.java
@@ -470,7 +470,6 @@ class DAVItem extends DAVDSpaceObject
      * 
      * @throws SQLException the SQL exception
      * @throws AuthorizeException the authorize exception
-     * @throws ServletException the servlet exception
      * @throws IOException Signals that an I/O exception has occurred.
      * @throws DAVStatusException the DAV status exception
      */
@@ -482,7 +481,6 @@ class DAVItem extends DAVDSpaceObject
         AuthorizeManager.authorizeAction(this.context, this.item, Constants.READ);
 
         String packageType = this.request.getParameter("package");
-        Bundle[] original = this.item.getBundles("ORIGINAL");
 
         if (packageType == null)
         {
diff --git a/dspace-stats/src/main/java/org/dspace/statistics/content/DatasetGenerator.java b/dspace-stats/src/main/java/org/dspace/statistics/content/DatasetGenerator.java
index efc3932839..2088da380e 100644
--- a/dspace-stats/src/main/java/org/dspace/statistics/content/DatasetGenerator.java
+++ b/dspace-stats/src/main/java/org/dspace/statistics/content/DatasetGenerator.java
@@ -23,16 +23,16 @@ package org.dspace.statistics.content;
 public abstract class DatasetGenerator {
     
     /** The type of generator can either be CATEGORY or SERIE **/
-    public int DatasetType;
+    protected int datasetType;
 
-    public boolean includeTotal = false;
+    protected boolean includeTotal = false;
 
     public int getDatasetType(){
-        return DatasetType;
+        return datasetType;
     }
 
     public void setDatasetType(int datasetType){
-        DatasetType = datasetType;
+        this.datasetType = datasetType;
     }
     
     public boolean isIncludeTotal() {
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowContainerUtils.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowContainerUtils.java
index af2436a10d..fd89b2352e 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowContainerUtils.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/FlowContainerUtils.java
@@ -330,7 +330,6 @@ public class FlowContainerUtils
 	 */
 	public static FlowResult processReimportCollection(Context context, int collectionID, Request request) throws SQLException, IOException, AuthorizeException, CrosswalkException, ParserConfigurationException, SAXException, TransformerException, BrowseException 
 	{
-		FlowResult result = new FlowResult();
 		Collection collection = Collection.find(context, collectionID);
 		HarvestedCollection hc = HarvestedCollection.find(context, collectionID);
 		
@@ -347,9 +346,7 @@ public class FlowContainerUtils
 		collection.update();
 		context.commit();
 		
-		result = processRunCollectionHarvest(context, collectionID, request);		
-		
-		return result;		
+		return processRunCollectionHarvest(context, collectionID, request);
 	}
 	
 	
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/EditContainerPolicies.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/EditContainerPolicies.java
index a1abfe6121..47cd407c31 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/EditContainerPolicies.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/EditContainerPolicies.java
@@ -117,7 +117,7 @@ public class EditContainerPolicies extends AbstractDSpaceTransformer
         int highlightID = parameters.getParameterAsInteger("highlightID",-1);
         String baseURL = contextPath+"/admin/epeople?administrative-continue="+knot.getId();
         
-        ArrayList<ResourcePolicy> policies = new ArrayList<ResourcePolicy>();
+        ArrayList<ResourcePolicy> policies;
 
         // DIVISION: edit-container-policies
         Division main = body.addInteractiveDivision("edit-container-policies",contextPath+"/admin/authorize",Division.METHOD_POST,"primary administrative authorization");
@@ -144,40 +144,44 @@ public class EditContainerPolicies extends AbstractDSpaceTransformer
         header.addCell().addContent(T_head_id);
         header.addCell().addContent(T_head_action);
         header.addCell().addContent(T_head_group);
-    	
-    	for (ResourcePolicy policy : policies) 
-    	{
-    		Row row;
-			if (policy.getID() == highlightID)
+
+        if (policies != null)
+        {
+            for (ResourcePolicy policy : policies)
             {
-                row = table.addRow(null, null, "highlight");
+                Row row;
+                if (policy.getID() == highlightID)
+                {
+                    row = table.addRow(null, null, "highlight");
+                }
+                else
+                {
+                    row = table.addRow();
+                }
+
+                CheckBox select = row.addCell().addCheckBox("select_policy");
+                select.setLabel(String.valueOf(policy.getID()));
+                select.addOption(String.valueOf(policy.getID()));
+
+                // Accounting for the funky case of an empty policy
+                Group policyGroup = policy.getGroup();
+
+                row.addCell().addXref(baseURL + "&submit_edit&policy_id=" + policy.getID(), String.valueOf(policy.getID()));
+                row.addCell().addXref(baseURL + "&submit_edit&policy_id=" + policy.getID(), policy.getActionText());
+                if (policyGroup != null) {
+                    Cell groupCell = row.addCell();
+                    groupCell.addContent(policyGroup.getName());
+                    Highlight groupHigh = groupCell.addHighlight("fade");
+                    groupHigh.addContent(" [");
+                    groupHigh.addXref(baseURL + "&submit_edit_group&group_id=" + policyGroup.getID(), T_group_edit);
+                    groupHigh.addContent("]");
+                }
+                else {
+                    row.addCell().addContent("...");
+                }
             }
-			else
-            {
-                row = table.addRow();
-            }
-    		
-    		CheckBox select = row.addCell().addCheckBox("select_policy");
-        	select.setLabel(String.valueOf(policy.getID()));
-        	select.addOption(String.valueOf(policy.getID()));
-        	
-        	// Accounting for the funky case of an empty policy
-        	Group policyGroup = policy.getGroup();
-        	
-        	row.addCell().addXref(baseURL + "&submit_edit&policy_id=" + policy.getID(), String.valueOf(policy.getID()));
-        	row.addCell().addXref(baseURL + "&submit_edit&policy_id=" + policy.getID(), policy.getActionText());
-        	if (policyGroup != null) {
-        		Cell groupCell = row.addCell();
-        		groupCell.addContent(policyGroup.getName());
-        		Highlight groupHigh = groupCell.addHighlight("fade");
-        		groupHigh.addContent(" [");
-        		groupHigh.addXref(baseURL + "&submit_edit_group&group_id=" + policyGroup.getID(), T_group_edit);
-        		groupHigh.addContent("]");
-        	}
-        	else {
-            	row.addCell().addContent("...");
-        	}
-	    }
+        }
+        
     	Para buttons = main.addPara();
     	buttons.addButton("submit_delete").setValue(T_submit_delete);
     	buttons.addButton("submit_return").setValue(T_submit_return);
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/EditItemPolicies.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/EditItemPolicies.java
index a1f9c1a542..77b0eeec5d 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/EditItemPolicies.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/authorization/EditItemPolicies.java
@@ -141,9 +141,6 @@ public class EditItemPolicies extends AbstractDSpaceTransformer
 		
 		ArrayList<ResourcePolicy> itemPolicies = (ArrayList<ResourcePolicy>)AuthorizeManager.getPolicies(context, item);
 		
-		ArrayList<ResourcePolicy> bundlePolicies = new ArrayList<ResourcePolicy>();
-		ArrayList<ResourcePolicy> bitstreamPolicies = new ArrayList<ResourcePolicy>();
-
 		// DIVISION: main
 		Division main = body.addInteractiveDivision("edit-item-policies",contextPath+"/admin/authorize",Division.METHOD_POST,"primary administrative authorization");
 		main.setHead(T_main_head.parameterize(item.getHandle(),item.getID()));
@@ -172,7 +169,7 @@ public class EditItemPolicies extends AbstractDSpaceTransformer
     		subheader.addCell(null, null, 1, 4, "indent").addHighlight("bold").addContent(T_subhead_bundle.parameterize(bundle.getName(),bundle.getID()));
     		subheader.addCell().addHighlight("bold").addXref(baseURL + "&submit_add_bundle_" + bundle.getID(), T_add_bundlePolicy_link);
 
-    		bundlePolicies = (ArrayList<ResourcePolicy>)AuthorizeManager.getPolicies(context, bundle);
+    		ArrayList<ResourcePolicy> bundlePolicies = (ArrayList<ResourcePolicy>)AuthorizeManager.getPolicies(context, bundle);
     		this.rowBuilder(baseURL, table, bundlePolicies, bundle.getID(), Constants.BUNDLE, highlightID);
     		
     		// And eventually to the bundle's bitstreams
@@ -182,7 +179,7 @@ public class EditItemPolicies extends AbstractDSpaceTransformer
         		subheader.addCell(null, null, 1, 4, "doubleIndent").addContent(T_subhead_bitstream.parameterize(bitstream.getName(),bitstream.getID()));
         		subheader.addCell().addXref(baseURL + "&submit_add_bitstream_" + bitstream.getID(), T_add_bitstreamPolicy_link);
 
-        		bitstreamPolicies = (ArrayList<ResourcePolicy>)AuthorizeManager.getPolicies(context, bitstream);
+        		ArrayList<ResourcePolicy> bitstreamPolicies = (ArrayList<ResourcePolicy>)AuthorizeManager.getPolicies(context, bitstream);
         		this.rowBuilder(baseURL, table, bitstreamPolicies, bitstream.getID(), Constants.BITSTREAM, highlightID);    			
     		}
     	}
diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java
index bc9c8a6ba4..41c66679f8 100644
--- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java
+++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/DescribeStep.java
@@ -190,8 +190,8 @@ public class DescribeStep extends AbstractSubmissionStep
                 Collection collection = submission.getCollection();
                 String actionURL = contextPath + "/handle/"+collection.getHandle() + "/submit/" + knot.getId() + ".continue";
 
-                DCInputSet inputSet = null;
-                DCInput[] inputs = {};
+                DCInputSet inputSet;
+                DCInput[] inputs;
                 try
                 {
                         inputSet = getInputsReader().getInputs(submission.getCollection().getHandle());
@@ -201,8 +201,6 @@ public class DescribeStep extends AbstractSubmissionStep
                 {
                         throw new UIException(se);
                 }
-                
-                
 
                 Division div = body.addInteractiveDivision("submit-describe",actionURL,Division.METHOD_POST,"primary submission");
                 div.setHead(T_submission_head);
@@ -357,7 +355,7 @@ public class DescribeStep extends AbstractSubmissionStep
 
             String inputType = input.getInputType();
             String pairsName = input.getPairsType();
-            DCValue[] values = new DCValue[0];
+            DCValue[] values;
 
             if (inputType.equals("qualdrop_value"))
             {
@@ -368,7 +366,7 @@ public class DescribeStep extends AbstractSubmissionStep
                 values = submission.getItem().getMetadata(input.getSchema(), input.getElement(), input.getQualifier(), Item.ANY);
             }
 
-            if (values.length > 0)
+            if (values != null && values.length > 0)
             {
                 for (DCValue value : values)
                 {
diff --git a/dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/Namespace.java b/dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/Namespace.java
index 741f3e75ed..121d3f032f 100644
--- a/dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/Namespace.java
+++ b/dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/Namespace.java
@@ -40,6 +40,8 @@
 
 package org.dspace.app.xmlui.wing;
 
+import java.io.Serializable;
+
 /**
  * This simple class just provides the Namespace datatype. It stores a URI that
  * is publicly accessible. The actually definitions of namespaces is found in
@@ -48,7 +50,7 @@ package org.dspace.app.xmlui.wing;
  * @author Scott Phillips
  */
 
-public class Namespace
+public class Namespace implements Serializable
 {
     /** The URI for this namespace */
     public final String URI;