diff --git a/client/src/views/game/components/carrier/BuildCarrier.vue b/client/src/views/game/components/carrier/BuildCarrier.vue
index 845e15b4b..9229dcc7f 100644
--- a/client/src/views/game/components/carrier/BuildCarrier.vue
+++ b/client/src/views/game/components/carrier/BuildCarrier.vue
@@ -19,10 +19,10 @@
 
     <div class="row mb-1">
         <div class="col">
-            <input v-model.lazy="starShips" type="number" class="form-control" @change="onStarShipsChanged">
+            <input v-model="starShips" type="number" class="form-control" @input="onStarShipsChanged">
         </div>
         <div class="col">
-            <input v-model.lazy="carrierShips" type="number" class="form-control" @change="onCarrierShipsChanged">
+            <input v-model="carrierShips" type="number" class="form-control" @input="onCarrierShipsChanged">
         </div>
     </div>
 
@@ -67,7 +67,7 @@
         </div>
         <div class="col-auto">
           <div class="d-grid gap-2">
-            <button type="button" class="btn btn-info" :disabled="$isHistoricalMode() || isBuildingCarrier || starShips < 0 || carrierShips < 0" @click="saveTransfer">
+            <button type="button" class="btn btn-info" :disabled="$isHistoricalMode() || isBuildingCarrier || starShips < 0 || carrierShips < 1" @click="saveTransfer">
                 <i class="fas fa-rocket"></i>
                 Build for ${{star.upgradeCosts.carriers}}
             </button>
@@ -108,12 +108,24 @@ export default {
     onCloseRequested (e) {
       this.$emit('onCloseRequested', e)
     },
-    onStarShipsChanged (e) {
-      let difference = parseInt(this.starShips) - this.star.ships
+    onStarShipsChanged(e) {
+      this.starShips = parseInt(this.starShips);
+
+      if (isNaN(this.starShips)) {
+        this.starShips = 0;
+      }
+
+      let difference = this.starShips - this.star.ships
       this.carrierShips = Math.abs(difference)
     },
-    onCarrierShipsChanged (e) {
-      let difference = parseInt(this.carrierShips)
+    onCarrierShipsChanged(e) {
+      this.carrierShips = parseInt(this.carrierShips);
+
+      if (isNaN(this.carrierShips)) {
+        this.carrierShips = 1;
+      }
+
+      let difference = this.carrierShips;
       this.starShips = this.star.ships - difference
     },
     onMinShipsClicked (e) {
diff --git a/client/src/views/game/components/carrier/ShipTransfer.vue b/client/src/views/game/components/carrier/ShipTransfer.vue
index 7709698e0..621c6457e 100644
--- a/client/src/views/game/components/carrier/ShipTransfer.vue
+++ b/client/src/views/game/components/carrier/ShipTransfer.vue
@@ -25,10 +25,10 @@
 
     <div class="row mb-1">
         <div class="col">
-            <input v-model.lazy="starShips" type="number" class="form-control" @change="onStarShipsChanged">
+            <input v-model="starShips" type="number" class="form-control" @input="onStarShipsChanged">
         </div>
         <div class="col">
-            <input v-model.lazy="carrierShips" type="number" class="form-control" @change="onCarrierShipsChanged">
+            <input v-model="carrierShips" type="number" class="form-control" @input="onCarrierShipsChanged">
         </div>
     </div>
 
@@ -68,7 +68,7 @@
         <div class="col-6"></div>
         <div class="col pe-0">
           <div class="d-grid gap-2">
-            <button type="button" class="btn btn-success me-1" :disabled="$isHistoricalMode() || isTransferringShips || starShips < 0 || carrierShips < 0" @click="saveTransfer">
+            <button type="button" class="btn btn-success me-1" :disabled="$isHistoricalMode() || isTransferringShips || starShips < 0 || carrierShips < 1" @click="saveTransfer">
               <i class="fas fa-check"></i>
               Transfer
             </button>
@@ -150,12 +150,24 @@ export default {
         this.onStarShipsChanged()
       }
     },
-    onStarShipsChanged (e) {
-      let difference = parseInt(this.starShips) - this.star.ships
+    onStarShipsChanged(e) {
+      this.starShips = parseInt(this.starShips);
+
+      if (isNaN(this.starShips)) {
+        this.starShips = 0;
+      }
+
+      let difference = this.starShips - this.star.ships
       this.carrierShips = this.carrier.ships - difference
     },
-    onCarrierShipsChanged (e) {
-      let difference = parseInt(this.carrierShips) - this.carrier.ships
+    onCarrierShipsChanged(e) {
+      this.carrierShips = parseInt(this.carrierShips);
+
+      if (isNaN(this.carrierShips)) {
+        this.carrierShips = 1;
+      }
+
+      let difference = this.carrierShips - this.carrier.ships
       this.starShips = this.star.ships - difference
     },
     onMinShipsClicked (e) {
@@ -194,8 +206,8 @@ export default {
       try {
         this.isTransferringShips = true
 
-        let cShips = parseInt(this.carrierShips)
-        let sShips = parseInt(this.starShips)
+        let cShips = this.carrierShips;
+        let sShips = this.starShips;
 
         let response = await CarrierApiService.transferShips(
           this.$store.state.game._id,
diff --git a/client/src/views/game/components/ledger/LedgerRow.vue b/client/src/views/game/components/ledger/LedgerRow.vue
index db24e3eac..2cc210e0c 100644
--- a/client/src/views/game/components/ledger/LedgerRow.vue
+++ b/client/src/views/game/components/ledger/LedgerRow.vue
@@ -58,7 +58,7 @@ export default {
             this.$toasted.show(`The debt ${playerAlias} owes you has been forgiven.`, { type: 'success' })
           }
 
-          ledger.debt = response.data.debt
+          ledger.debt = response.data.ledger.debt
         } catch (err) {
           console.error(err)
         }
@@ -89,7 +89,7 @@ export default {
             gameHelper.getUserPlayer(this.$store.state.game).ledger.creditsSpecialists -= Math.abs(ledger.debt)
           }
 
-          ledger.debt = response.data.debt
+          ledger.debt = response.data.ledger.debt;
         } catch (err) {
           console.error(err)
         }
diff --git a/client/src/views/game/components/welcome/EnterPassword.vue b/client/src/views/game/components/welcome/EnterPassword.vue
index fbd7e15e5..6541b70f9 100644
--- a/client/src/views/game/components/welcome/EnterPassword.vue
+++ b/client/src/views/game/components/welcome/EnterPassword.vue
@@ -10,7 +10,7 @@
         <div class="col">
             <form @submit.prevent>
                 <div class="mb-2 mt-3">
-                    <input class="form-control" required="required" placeholder="Password" type="password" v-model="password" v-on:keyup="onPasswordChanged">
+                    <input class="form-control" required="required" placeholder="Password" type="password" v-model="password" @change="onPasswordChanged">
                 </div>
             </form>
         </div>
diff --git a/client/src/views/game/components/welcome/SelectAlias.vue b/client/src/views/game/components/welcome/SelectAlias.vue
index 9fca5b7ca..d16a47288 100644
--- a/client/src/views/game/components/welcome/SelectAlias.vue
+++ b/client/src/views/game/components/welcome/SelectAlias.vue
@@ -20,7 +20,7 @@
                     <p v-if="avatar"><small class="linebreaks">{{avatar.description}}</small></p>
 
                     <div class="mb-2">
-                      <input name="alias" class="form-control" required="required" placeholder="Enter your alias here" type="text" minlength="3" maxlength="24" v-model="alias" v-on:keyup="onAliasChanged">
+                      <input name="alias" class="form-control" required="required" placeholder="Enter your alias here" type="text" minlength="3" maxlength="24" v-model="alias" @change="onAliasChanged">
                     </div>
 
                     <!-- <div class="mb-2 text-center small">