diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java
index 40e7ded9..2d52802d 100644
--- a/src/services/CharacterService.java
+++ b/src/services/CharacterService.java
@@ -287,26 +287,22 @@ public class CharacterService implements INetworkDispatch {
 					Console.println("Added empty mission " + missionsAdded);
 				}*/
 				
-				TangibleObject backpack = (TangibleObject) core.objectService.createObject("object/tangible/wearables/backpack/shared_backpack_galactic_marine.iff", object.getPlanet());
-				inventory._add(backpack);
 				object.addObjectToEquipList(datapad);
 				object.addObjectToEquipList(inventory);
 				object.addObjectToEquipList(bank);
 				object.addObjectToEquipList(missionBag);
 				object.addObjectToEquipList(appInventory);
 				
-				WeaponObject weapon = (WeaponObject) core.objectService.createObject("object/weapon/ranged/rifle/shared_rifle_a280.iff", object.getPlanet());
 				WeaponObject defaultWeapon = (WeaponObject) core.objectService.createObject("object/weapon/creature/shared_creature_default_weapon.iff", object.getPlanet());
-
+				defaultWeapon.setDamageType("@obj_attr_n:armor_eff_kinetic");
+				defaultWeapon.setStringAttribute("cat_wpn_damage.damage", "0-0");
+				defaultWeapon.setMaxDamage(100);
+				defaultWeapon.setMinDamage(50);
+				
 				object.addObjectToEquipList(defaultWeapon);
 
 				object._add(defaultWeapon);
-
-				object.addObjectToEquipList(weapon);
-
-				object._add(weapon);
-				object.setWeaponId(weapon.getObjectID());
-
+				object.setWeaponId(defaultWeapon.getObjectID());
 				core.scriptService.callScript("scripts/", "starterclothing", "CreateStarterClothing", core, object, clientCreateCharacter.getStarterProfession(), clientCreateCharacter.getRaceTemplate());
 				core.scriptService.callScript("scripts/", "CreateStartingCharacter", "demo", core, object);
 				
diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java
index 3e658122..b36e9bcc 100644
--- a/src/services/combat/CombatService.java
+++ b/src/services/combat/CombatService.java
@@ -443,17 +443,17 @@ public class CombatService implements INetworkDispatch {
 		switch(elementalType) {
 		
 			case ElementalType.KINETIC:
-				baseArmor = target.getSkillMod("kinetic").getBase();
+				baseArmor = target.getSkillModBase("kinetic");
 			case ElementalType.ENERGY:
-				baseArmor = target.getSkillMod("energy").getBase();
+				baseArmor = target.getSkillModBase("energy");
 			case ElementalType.HEAT:
-				baseArmor = target.getSkillMod("heat").getBase();
+				baseArmor = target.getSkillModBase("heat");
 			case ElementalType.COLD:
-				baseArmor = target.getSkillMod("cold").getBase();
+				baseArmor = target.getSkillModBase("cold");
 			case ElementalType.ACID:
-				baseArmor = target.getSkillMod("acid").getBase();
+				baseArmor = target.getSkillModBase("acid");
 			case ElementalType.ELECTRICITY:
-				baseArmor = target.getSkillMod("electricity").getBase();
+				baseArmor = target.getSkillModBase("electricity");
 
 		}