diff --git a/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/app/RawWrite.java b/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/app/RawWrite.java
index 8e4dbe82..6cbce310 100644
--- a/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/app/RawWrite.java
+++ b/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/app/RawWrite.java
@@ -31,8 +31,8 @@ public static void main(String[] args) {
         try {
             System.out.println(new Date());
 
-            HashMap options = getOptions(args);
-            List rootArgs = (List) options.get("rootArgs");
+            HashMap<String, Object> options = getOptions(args);
+            List<?> rootArgs = (List<?>) options.get("rootArgs");
             String baseURL = null;
             if (rootArgs.size() > 0) {
                 baseURL = (String) rootArgs.get(0);
@@ -151,9 +151,9 @@ public static void run(String baseURL, String from, String until,
         out.write("</harvest>\n".getBytes("UTF-8"));
     }
 
-    private static HashMap getOptions(String[] args) {
-        HashMap options = new HashMap();
-        ArrayList rootArgs = new ArrayList();
+    private static HashMap<String, Object> getOptions(String[] args) {
+        HashMap<String, Object> options = new HashMap<>();
+        ArrayList<String> rootArgs = new ArrayList<>();
         options.put("rootArgs", rootArgs);
 
         for (int i = 0; i < args.length; ++i) {
diff --git a/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/ListIdentifiers.java b/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/ListIdentifiers.java
index bfeed92a..6a0c340c 100644
--- a/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/ListIdentifiers.java
+++ b/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/ListIdentifiers.java
@@ -12,8 +12,11 @@
 package org.oclc.oai.harvester2.verb;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPathExpressionException;
 import org.xml.sax.SAXException;
@@ -106,12 +109,13 @@ private static String getRequestURL(String baseURL, String from, String until, S
      * @param baseURL
      * @param resumptionToken
      * @return
+     * @throws UnsupportedEncodingException
      */
     private static String getRequestURL(String baseURL,
-            String resumptionToken) {
+            String resumptionToken) throws UnsupportedEncodingException {
         StringBuilder requestURL = new StringBuilder(baseURL);
         requestURL.append("?verb=ListIdentifiers");
-        requestURL.append("&resumptionToken=").append(URLEncoder.encode(resumptionToken));
+        requestURL.append("&resumptionToken=").append(URLEncoder.encode(resumptionToken, StandardCharsets.UTF_8.name()));
         return requestURL.toString();
     }
 }
diff --git a/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/OAINamespaceContext.java b/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/OAINamespaceContext.java
index 8eb8a743..ec4033f9 100644
--- a/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/OAINamespaceContext.java
+++ b/metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/OAINamespaceContext.java
@@ -36,7 +36,7 @@ public String getPrefix(String namespaceURI) {
     }
 
     @Override
-    public Iterator getPrefixes(String namespaceURI) {
+    public Iterator<?> getPrefixes(String namespaceURI) {
         return null;
     }