diff --git a/include/openbsc/gsm_04_08.h b/include/openbsc/gsm_04_08.h
index 1513ade..920d84c 100644
--- a/include/openbsc/gsm_04_08.h
+++ b/include/openbsc/gsm_04_08.h
@@ -22,7 +22,7 @@
 			u_int8_t arfcn_low;
 		} h0;
 	};
-};
+} __attribute__ ((packed));
 
 /* Chapter 10.5.2.30 */
 struct gsm48_req_ref {
@@ -31,7 +31,7 @@
 		 t1_:5;
 	u_int8_t t2:5,
 		 t3_low:3;
-};
+} __attribute__ ((packed));
 
 /* Chapter 9.1.18 */
 struct gsm48_imm_ass {
@@ -44,7 +44,7 @@
 	u_int8_t timing_advance;
 	u_int8_t mob_alloc_len;
 	u_int8_t mob_alloc[0];
-};
+} __attribute__ ((packed));
 
 /* Chapter 10.5.1.3 */
 struct gsm48_loc_area_id {
diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h
index 2d0c3c5..c0c431e 100644
--- a/include/openbsc/gsm_data.h
+++ b/include/openbsc/gsm_data.h
@@ -126,8 +126,8 @@
 
 struct gsm_network {
 	/* global parameters */
-	u_int8_t country_code;
-	u_int8_t network_code;
+	u_int16_t country_code;
+	u_int16_t network_code;
 
 	unsigned int num_bts;
 	/* private lists */
@@ -136,8 +136,8 @@
 	struct gsm_subscriber *subscriber;
 };
 
-struct gsm_network *gsm_network_init(unsigned int num_bts, u_int8_t country_code,
-				     u_int8_t network_code);
+struct gsm_network *gsm_network_init(unsigned int num_bts, u_int16_t country_code,
+				     u_int16_t network_code);
 
 enum gsm_e1_event {
 	EVT_E1_NONE,
diff --git a/src/bsc_hack.c b/src/bsc_hack.c
index 3076758..aab4d0f 100644
--- a/src/bsc_hack.c
+++ b/src/bsc_hack.c
@@ -587,20 +587,21 @@
 		(struct gsm48_system_information_type_4*)&si4;
 	struct gsm48_system_information_type_6 *type_6 =
 		(struct gsm48_system_information_type_6*)&si6;
+	struct gsm48_loc_area_id lai;
+
+	gsm0408_generate_lai(&lai, bts->network->country_code,
+				bts->network->network_code, bts->location_area_code);
 
 	/* assign the MCC and MNC */
-	gsm0408_generate_lai(&type_3->lai, bts->network->country_code,
-				bts->network->network_code, bts->location_area_code);
-	gsm0408_generate_lai(&type_4->lai, bts->network->country_code,
-				bts->network->network_code, bts->location_area_code);
-	gsm0408_generate_lai(&type_6->lai, bts->network->country_code,
-				bts->network->network_code, bts->location_area_code);
+	type_3->lai = lai;
+	type_4->lai = lai;
+	type_6->lai = lai;
 }
 
 
 static void bootstrap_rsl(struct gsm_bts *bts)
 {
-	fprintf(stdout, "bootstrapping RSL\n");
+	fprintf(stdout, "bootstrapping RSL MCC=%u MNC=%u\n", MCC, MNC);
 	patch_tables(bts);
 	set_system_infos(bts);
 
diff --git a/src/gsm_data.c b/src/gsm_data.c
index 61f8682..ed81954 100644
--- a/src/gsm_data.c
+++ b/src/gsm_data.c
@@ -24,8 +24,8 @@
 
 #include <openbsc/gsm_data.h>
 
-struct gsm_network *gsm_network_init(unsigned int num_bts, u_int8_t country_code,
-				     u_int8_t network_code)
+struct gsm_network *gsm_network_init(unsigned int num_bts, u_int16_t country_code,
+				     u_int16_t network_code)
 {
 	int i;
 	struct gsm_network *net;