diff --git a/ttcn/LibIts_Interface.ttcn b/ttcn/LibIts_Interface.ttcn
index e46d2b0de95b48bbdf4362e7df4bdb55344b4640..f963b504ad7a2750c7e22de7e52abf9a188b1efd 100644
--- a/ttcn/LibIts_Interface.ttcn
+++ b/ttcn/LibIts_Interface.ttcn
@@ -9,6 +9,7 @@ module LibIts_Interface {
     
     // LibIts
     import from LibItsCam_Pixits all;
+    import from LibItsGeoNetworking_TypesAndValues all;
     
     // LibCommon
     import from LibCommon_Time {modulepar all};
@@ -168,7 +169,7 @@ module LibIts_Interface {
 				 * @desc NT2 GeoNetworking Port (GeoNetworking/G5) 
 				 */
 				type port GeoNetworkingPort message {
-				    in integer; //TODO: remove me
+				    inout GeoNetworkingPacket
 				} // end GeoNetworkingPort
 
 				/**
diff --git a/ttcn/LibIts_TestSystem.ttcn b/ttcn/LibIts_TestSystem.ttcn
index a8661cbf23d5cc222f23474277456f841ac90e69..90f3174d39db669ddf1320a9666da4f6f6ddaaa7 100644
--- a/ttcn/LibIts_TestSystem.ttcn
+++ b/ttcn/LibIts_TestSystem.ttcn
@@ -37,14 +37,14 @@ module LibIts_TestSystem {
     	 * @desc ITS Main Test Component 
     	 */
     	type component ItsMtc {
+
+            // timers
+           	timer tc_guard := PX_TDONE;   
     	    
     	    // ports
     	    port UpperTesterPort utPort;
             port AdapterControlPort acPort;
             
-            // timers
-           	timer tc_guard := PX_TDONE;           
-            
     	} // end ItsMtc
     
     	/**