diff --git a/gui/builtinContextMenus/amount.py b/gui/builtinContextMenus/amount.py
index 99acdf247..4ab98e694 100644
--- a/gui/builtinContextMenus/amount.py
+++ b/gui/builtinContextMenus/amount.py
@@ -51,11 +51,11 @@ class AmountChanger(wx.Dialog):
         fitID = mainFrame.getActiveFit()
 
         if isinstance(self.thing, eos.types.Cargo):
-            sFit.addCargo(fitID, self.thing.item.ID, int(self.input.GetLineText(0)), replace=True)
+            sFit.addCargo(fitID, self.thing.item.ID, int(float(self.input.GetLineText(0))), replace=True)
         elif isinstance(self.thing, eos.types.Fit):
-            sFit.changeAmount(fitID, self.thing, int(self.input.GetLineText(0)))
+            sFit.changeAmount(fitID, self.thing, int(float(self.input.GetLineText(0))))
         elif isinstance(self.thing, eos.types.Fighter):
-            sFit.changeActiveFighters(fitID, self.thing, int(self.input.GetLineText(0)))
+            sFit.changeActiveFighters(fitID, self.thing, int(float(self.input.GetLineText(0))))
 
         wx.PostEvent(mainFrame, GE.FitChanged(fitID=fitID))
 
diff --git a/gui/characterEditor.py b/gui/characterEditor.py
index 82b47fd62..012ab52cf 100644
--- a/gui/characterEditor.py
+++ b/gui/characterEditor.py
@@ -158,6 +158,8 @@ class CharacterEditor(wx.Frame):
         self.Bind(GE.CHAR_LIST_UPDATED, self.refreshCharacterList)
         self.entityEditor.Bind(wx.EVT_CHOICE, self.charChanged)
 
+        self.charChanged(None)
+
     def btnRestrict(self):
         char = self.entityEditor.getActiveEntity()