diff --git a/Generators/McEventSelector/McEventSelector/McEventSelector.h b/Generators/McEventSelector/McEventSelector/McEventSelector.h
index bd4ac19d8ccc2b23ae6d31d9ca6c189d41bec357..4604b8cd013846e1dd1dcdbaf444a65b7702f7a4 100644
--- a/Generators/McEventSelector/McEventSelector/McEventSelector.h
+++ b/Generators/McEventSelector/McEventSelector/McEventSelector.h
@@ -79,22 +79,22 @@ public:
 
 private:
   //  EventSource* p_eventSource;
-  IntegerProperty          m_runNo;
-  UnsignedLongLongProperty m_firstEventNo;
-  UnsignedLongLongProperty m_eventsPerRun;
-  IntegerProperty          m_firstLBNo;
-  IntegerProperty          m_eventsPerLB;
-  IntegerProperty          m_initTimeStamp;
-  IntegerProperty          m_timeStampInterval;
+  Gaudi::CheckedProperty<int>          m_runNo;
+  Gaudi::CheckedProperty<unsigned long long> m_firstEventNo;
+  Gaudi::CheckedProperty<unsigned long long> m_eventsPerRun;
+  Gaudi::CheckedProperty<int>          m_firstLBNo;
+  Gaudi::CheckedProperty<int>          m_eventsPerLB;
+  Gaudi::CheckedProperty<int>          m_initTimeStamp;
+  Gaudi::Property<int>          m_timeStampInterval;
 
   /// Flags to indicate override of run/event/time 
   ///  These are always true and are here for consistency
   ///  with other event selectors which only optionally 
   ///  override these numbers.
-  BooleanProperty m_overrideRunNumber;
-  BooleanProperty m_overrideEventNumber;
-  BooleanProperty m_overrideLBNumber;
-  BooleanProperty m_overrideTimeStamp;
+  Gaudi::Property<bool> m_overrideRunNumber;
+  Gaudi::Property<bool> m_overrideEventNumber;
+  Gaudi::Property<bool> m_overrideLBNumber;
+  Gaudi::Property<bool> m_overrideTimeStamp;
 
   mutable McContext *m_ctx;
 
diff --git a/Generators/McEventSelector/src/McCnvSvc.cxx b/Generators/McEventSelector/src/McCnvSvc.cxx
index 05ab52b4a75223a54fe63b4229a6dad10161f2dc..11601d722fa53bb79a957989603efa86059f6b37 100644
--- a/Generators/McEventSelector/src/McCnvSvc.cxx
+++ b/Generators/McEventSelector/src/McCnvSvc.cxx
@@ -41,7 +41,7 @@ StatusCode McCnvSvc::initialize()     {
 
 /// Update state of the service
 StatusCode McCnvSvc::updateServiceState(IOpaqueAddress* pAddress)    {
-  MsgStream log(messageService(), name());
+  MsgStream log(msgSvc(), name());
   static bool first = true;
   //  static int fid   = 0;
   //  static int recid = 0;