diff --git a/application/libraries/Adif_parser.php b/application/libraries/Adif_parser.php
index 06f6fc52..96f670ed 100644
--- a/application/libraries/Adif_parser.php
+++ b/application/libraries/Adif_parser.php
@@ -119,7 +119,15 @@ class ADIF_Parser
 	
 	public function feed($input_data) //allows the parser to be fed a string
 	{
-		$this->data = $input_data;
+		
+		if (strpos($input_data, "<EOH>") !== false) {
+			$arr=explode("<EOH>",$input_data);
+			$newstring = $arr[1];
+			$this->data = $newstring;
+		} else {
+			$this->data = $input_data;
+		}
+
         $this->datasplit = preg_split("/<eor>/i", mb_substr($this->data, $this->i, NULL, "UTF-8"));
 	}
 	
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index 3974a7c6..e22c9e01 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -87,6 +87,15 @@ $(function () {
 	});
 });
 
+// We don't want spaces to be written in serial
+$(function () {
+	$('#exch_serial_r').on('keypress', function (e) {
+		if (e.which == 32) {
+			return false;
+		}
+	});
+});
+
 // Here we capture keystrokes to execute functions
 document.onkeyup = function (e) {
 	// ALT-W wipe