diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java
index 148ee2ba..eedc9ec8 100644
--- a/src/resources/objects/creature/CreatureMessageBuilder.java
+++ b/src/resources/objects/creature/CreatureMessageBuilder.java
@@ -88,12 +88,16 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		CreatureObject creature = (CreatureObject) object;
 		IoBuffer buffer = bufferPool.allocate(100, false).order(ByteOrder.LITTLE_ENDIAN);
 		buffer.setAutoExpand(true);
+		
+		if(creature.getStfName() == null || creature.getStfFilename() == null) {
+			creature.setStfName("");
+			creature.setStfFilename("");
+		}
 
 		buffer.putShort((short) 19);	// Object Count
 		buffer.putFloat(1);
 		buffer.put(getAsciiString(creature.getStfFilename()));
 		buffer.putInt(0);	
-		if(creature.getStfName() == null) creature.setStfName("");
 		buffer.put(getAsciiString(creature.getStfName()));
 		if (creature.getCustomName() == null) { creature.setCustomName(""); }//Not all CreatureObjects have CustomName (Shuttles)
 		buffer.put(getUnicodeString(creature.getCustomName()));
diff --git a/src/services/DevService.java b/src/services/DevService.java
index 2b85d73c..65bc921f 100644
--- a/src/services/DevService.java
+++ b/src/services/DevService.java
@@ -123,13 +123,13 @@ public class DevService implements INetworkDispatch {
 					
 					// Character
 					case 10: // Set combat level to 90
-						core.playerService.giveExperience(player, 999999999);
+						core.playerService.grantLevel(player, 90);
 						return;
 					case 11: // Give 100,000 credits
 						player.setCashCredits(player.getCashCredits() + 100000);
 						return;
 					case 12: // Reset expertise
-						resetExpertiseSkills(player);
+						player.getSkills().get().stream().filter(s -> s.contains("expertise")).forEach(s -> core.skillService.removeSkill(creature, s));
 						return;
 						
 					// Items
@@ -278,16 +278,6 @@ public class DevService implements INetworkDispatch {
 		core.suiService.openSUIWindow(window);	
 	}
 	
-	public void resetExpertiseSkills(CreatureObject creature)
-	{
-		for(int i = creature.getSkills().size() - 1; i >= 0; i-- )
-		{
-		    String skill = creature.getSkills().get(i);
-		    if(skill.contains("expertise")) creature.removeSkill(skill);
-		}
-	}
-
-	
 	@Override
 	public void insertOpcodes(Map<Integer, INetworkRemoteEvent> swgOpcodes, Map<Integer, INetworkRemoteEvent> objControllerOpcodes) {
 	}