diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php
index 8365d74..f67b553 100644
--- a/app/Classes/FTN/Message.php
+++ b/app/Classes/FTN/Message.php
@@ -68,7 +68,7 @@ class Message extends FTNBase
 
 	private const USER_FROM_LEN	= 36;	// FTS-0001.016 From Name: upto 36 chars null terminated
 	private const USER_TO_LEN	= 36;	// FTS-0001.016 To Name: upto 36 chars null terminated
-	private const SUBJECT_LEN	= 72;	// FTS-0001.016 Subject: upto 72 chars null terminated
+	private const SUBJECT_LEN	= 71;	// FTS-0001.016 Subject: upto 72 chars null terminated
 	private const AREATAG_LEN	= 35;	//
 
 	private ?ValidatorResult $errors = NULL;	// Packet validation
diff --git a/app/Models/Address.php b/app/Models/Address.php
index f8cb726..08c9fad 100644
--- a/app/Models/Address.php
+++ b/app/Models/Address.php
@@ -130,11 +130,11 @@ class Address extends Model
 
 		// Check our numbers are correct.
 		foreach ([1,2,3] as $i) {
-			if (! $matches[$i] || ($matches[$i] > DomainController::NUMBER_MAX))
+			if ((! is_numeric($matches[$i])) || ($matches[$i] > DomainController::NUMBER_MAX))
 				throw new Exception('Invalid FTN: '.$ftn);
 		}
 
-		if (isset($matches[5]) AND $matches[5] > DomainController::NUMBER_MAX)
+		if (isset($matches[5]) AND ((! is_numeric($matches[$i])) || ($matches[5] > DomainController::NUMBER_MAX)))
 			throw new Exception('Invalid FTN: '.$ftn);
 
 		return [
diff --git a/resources/views/layouts/partials/scripts.blade.php b/resources/views/layouts/partials/scripts.blade.php
index c29455c..7fe1747 100644
--- a/resources/views/layouts/partials/scripts.blade.php
+++ b/resources/views/layouts/partials/scripts.blade.php
@@ -34,6 +34,6 @@
 
 					form.classList.add('was-validated')
 				}, false)
-			})
+			});
 	})()
 </script>
\ No newline at end of file
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index 02dce6c..5684fb2 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -39,7 +39,7 @@ use App\Models\Setup;
 									@else
 										A system is required.
 									@enderror
-							</span>
+								</span>
 								<span class="input-helper">Add a <a href="{{ url('ftn/system/addedit') }}">NEW System</a></span>
 							</div>
 						</div>