diff --git a/lapd/LAPDm_Types.ttcn b/lapd/LAPDm_Types.ttcn
index c52b96c..43c75ec 100644
--- a/lapd/LAPDm_Types.ttcn
+++ b/lapd/LAPDm_Types.ttcn
@@ -16,6 +16,12 @@
 		uint1_t el
 	} with { variant "" };
 
+	template LapdmLengthIndicator t_LapdmLengthIndicator(template uint6_t len, boolean m := false) := {
+		len := len,
+		m := m,
+		el := 1
+	};
+
 	/* TS 44.006 Figure 4 */
 	type record LapdmAddressField {
 		BIT1		spare,
@@ -25,7 +31,7 @@
 		boolean		ea
 	} with { variant "" };
 
-	template LapdmAddressField tr_LapdmAddr(LapdmSapi sapi, boolean c_r) := {
+	template LapdmAddressField tr_LapdmAddr(template LapdmSapi sapi, template boolean c_r) := {
 		spare := '0'B,
 		lpd := 0,
 		sapi := sapi,
@@ -153,4 +159,4 @@
 	external function dec_LapdmFrameB4(in octetstring stream) return LapdmFrameB4
 		with { extension "prototype(convert) decode(RAW)" };
 
-} with { encode "RAW" };
+} with { encode "RAW"; variant "FIELDORDER(msb)" }