diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index 04458ad88e64a09444911de1e0e037a0e351ade7..6cdb12527cb8cda7f09c41c9474fd7b48604114d 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -39,7 +39,6 @@
 using namespace LOFAR::GCF::Common;
 using namespace LOFAR::GCF::TM;
 using namespace LOFAR::GCF::PAL;
-using namespace LOFAR::OTDB;
 using namespace std;
 
 namespace LOFAR {
@@ -314,6 +313,10 @@ GCFEvent::TResult ObservationControl::active_state(GCFEvent& event, GCFPortInter
 		CONTROLConnectEvent		msg(event);
 		LOG_DEBUG_STR("Received CONNECT(" << msg.cntlrName << ")");
 		// TODO: do something usefull with this information!
+		CONTROLConnectedEvent	answer;
+		answer.cntlrName = msg.cntlrName;
+		answer.result = CT_RESULT_NO_ERROR;
+		itsParentPort->send(answer);
 		break;
 	}
 
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
index 303283a3170509535110c6b0c959bb06bbc8bb0b..e2c0059138215fde08df28db0f009a4d94f29c41 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
@@ -39,6 +39,7 @@
 #include <APL/APLCommon/PropertySetAnswer.h>
 #include <APL/APLCommon/APLCommonExceptions.h>
 #include <APL/APLCommon/Controller_Protocol.ph>
+#include <APL/APLCommon/APL_Defines.h>
 #include <APL/APLCommon/ChildControl.h>
 #include <APL/APLCommon/ParentControl.h>
 #include <APL/APLCommon/CTState.h>
@@ -62,7 +63,9 @@ using	GCF::TM::GCFPort;
 using	GCF::TM::GCFEvent;
 using	GCF::TM::GCFPortInterface;
 using	GCF::TM::GCFTask;
-
+using	APLCommon::ChildControl;
+using	APLCommon::ParentControl;
+using	APLCommon::CTState;
 
 class ObservationControl : public GCFTask,
 						   APLCommon::PropertySetAnswerHandlerInterface
@@ -92,7 +95,7 @@ private:
    	void _connectedHandler(GCFPortInterface& port);
    	void _disconnectedHandler(GCFPortInterface& port);
    	boost::shared_ptr<ACC::APS::ParameterSet> 
-		 readObservationParameters (OTDB::treeIDType	ObsTreeID);
+		 readObservationParameters (APLCommon::OTDBtreeIDType	ObsTreeID);
 
    	typedef boost::shared_ptr<GCF::PAL::GCFMyPropertySet> GCFMyPropertySetPtr;
 
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.log_prop.in b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.log_prop.in
index 014e32162d939ee0cd2716348fc1e2e9117c10ad..c8bd123789ec1312d0a8a1e5ada09738d936cfa5 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.log_prop.in
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.log_prop.in
@@ -8,7 +8,7 @@ log4cplus.additivity.TRC=FALSE
 
 log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
 log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{9} - %m [%.25l]%n
+log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{9} - %m [%.25l]%n
 log4cplus.appender.STDOUT.logToStdErr=true
 
 log4cplus.appender.FILE=log4cplus::RollingFileAppender
@@ -16,5 +16,5 @@ log4cplus.appender.FILE.File=../log/ObservationControl.log
 log4cplus.appender.FILE.MaxFileSize=5MB
 log4cplus.appender.FILE.MaxBackupIndex=5
 log4cplus.appender.FILE.layout=log4cplus::PatternLayout
-log4cplus.appender.FILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
+log4cplus.appender.FILE.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n