diff --git a/code/src/java/pcgen/core/Equipment.java b/code/src/java/pcgen/core/Equipment.java
index 628b829e519..0868c939eb2 100644
--- a/code/src/java/pcgen/core/Equipment.java
+++ b/code/src/java/pcgen/core/Equipment.java
@@ -3042,7 +3042,7 @@ public void setToCustomSize(PlayerCharacter pc)
 		if (csr != null)
 		{
 			SizeAdjustment customSize = csr.get();
-			if (!getSafe(ObjectKey.SIZE).equals(customSize))
+			if (!getSafe(ObjectKey.SIZE).get().equals(customSize))
 			{
 				resizeItem(pc, customSize);
 			}
diff --git a/code/src/java/pcgen/core/analysis/AttackInfo.java b/code/src/java/pcgen/core/analysis/AttackInfo.java
index 25ca7652f29..2fabac520d6 100644
--- a/code/src/java/pcgen/core/analysis/AttackInfo.java
+++ b/code/src/java/pcgen/core/analysis/AttackInfo.java
@@ -46,12 +46,12 @@ public static String getAttackInfo(PlayerCharacter pc, AttackType attackType, St
 	{
 		if (modifier.equals("TOTAL"))
 		{
-			if (attackType.equals("RANGED"))
+			if (attackType.equals(AttackType.RANGED))
 			{
 				int total = getTotalToken(pc, attackType);
 				return pc.getAttackString(AttackType.RANGED, total);
 			}
-			else if (attackType.equals("UNARMED"))
+			else if (attackType.equals(AttackType.UNARMED))
 			{
 				int total = getTotalToken(pc, AttackType.MELEE);
 				// TODO: Is this correct for 3.0 also?
diff --git a/code/src/java/pcgen/gui2/facade/CharacterUtils.java b/code/src/java/pcgen/gui2/facade/CharacterUtils.java
index e81b72408be..11d76587051 100644
--- a/code/src/java/pcgen/gui2/facade/CharacterUtils.java
+++ b/code/src/java/pcgen/gui2/facade/CharacterUtils.java
@@ -96,7 +96,7 @@ public static void selectClothes(final PlayerCharacter aPC)
 						//
 						// Need to resize to fit?
 						//
-						if (!pcSizeAdj.equals(eq.getSafe(ObjectKey.SIZE)))
+						if (!pcSizeAdj.equals(eq.getSafe(ObjectKey.SIZE).get()))
 						{
 							eq.resizeItem(aPC, pcSizeAdj);
 						}
diff --git a/code/src/java/pcgen/io/ExportHandler.java b/code/src/java/pcgen/io/ExportHandler.java
index f60ca833bfd..cb1d54338ed 100644
--- a/code/src/java/pcgen/io/ExportHandler.java
+++ b/code/src/java/pcgen/io/ExportHandler.java
@@ -42,11 +42,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import freemarker.template.Configuration;
-import freemarker.template.ObjectWrapper;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-import freemarker.template.Version;
 import pcgen.cdom.base.CDOMObject;
 import pcgen.cdom.base.Constants;
 import pcgen.cdom.enumeration.ListKey;
@@ -93,6 +88,12 @@
 import pcgen.util.Logging;
 import pcgen.util.enumeration.View;
 
+import freemarker.template.Configuration;
+import freemarker.template.ObjectWrapper;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+import freemarker.template.Version;
+
 /**
  * This class deals with exporting a PC to various types of output sheets 
  * including XML, HTML, PDF and Text.