diff --git a/src/main/java/com/solab/iso8583/IsoMessage.java b/src/main/java/com/solab/iso8583/IsoMessage.java
index 9c79333..5f5dc74 100644
--- a/src/main/java/com/solab/iso8583/IsoMessage.java
+++ b/src/main/java/com/solab/iso8583/IsoMessage.java
@@ -399,7 +399,7 @@ public class IsoMessage {
      * not present in the source message it is simply ignored. */
     public void copyFieldsFrom(IsoMessage src, int...idx) {
     	for (int i : idx) {
-    		IsoValue<Object> v = src.getField(i);
+    		IsoValue<?> v = src.getField(i);
     		if (v != null) {
         		setValue(i, v.getValue(), v.getEncoder(), v.getType(), v.getLength());
     		}
diff --git a/src/main/java/com/solab/iso8583/MessageFactory.java b/src/main/java/com/solab/iso8583/MessageFactory.java
index a7078f1..dc7ccd9 100644
--- a/src/main/java/com/solab/iso8583/MessageFactory.java
+++ b/src/main/java/com/solab/iso8583/MessageFactory.java
@@ -56,9 +56,9 @@ public class MessageFactory<T extends IsoMessage> {
 	/** This map stores the message template for each message type. */
 	private Map<Integer, T> typeTemplates = new HashMap<Integer, T>();
 	/** Stores the information needed to parse messages sorted by type. */
-	private Map<Integer, Map<Integer, FieldParseInfo>> parseMap = new HashMap<Integer, Map<Integer, FieldParseInfo>>();
+	protected Map<Integer, Map<Integer, FieldParseInfo>> parseMap = new HashMap<Integer, Map<Integer, FieldParseInfo>>();
 	/** Stores the field numbers to be parsed, in order of appearance. */
-	private Map<Integer, List<Integer>> parseOrder = new HashMap<Integer, List<Integer>>();
+    protected Map<Integer, List<Integer>> parseOrder = new HashMap<Integer, List<Integer>>();
 
 	private TraceNumberGenerator traceGen;
 	/** The ISO header to be included in each message type. */