diff --git a/RTCP/Cobalt/CoInterface/src/LTAFeedback.h b/RTCP/Cobalt/CoInterface/src/LTAFeedback.h
index 6a2608e8f294f6d31f5e29fa902df6914ccc0ba7..6e7d560d9cdf90ec71b37a4e1a792700f312906a 100644
--- a/RTCP/Cobalt/CoInterface/src/LTAFeedback.h
+++ b/RTCP/Cobalt/CoInterface/src/LTAFeedback.h
@@ -60,11 +60,11 @@ namespace LOFAR
       // Package (sip) for the LTA.
       // \see http://proposal.astron.nl/schemas/LTA-SIP.xsd
       ParameterSet                allFeedback() const;
-      const int major_version = 3;
-      const int minor_version = 1;
-      const int patch_number = 0;
-      const std::string feedback_version = std::str(boost::format("%02d.%02d.%02d") % 
-                                           major_version % minor_version % patch_number);
+      static const int major_version = 3;
+      static const int minor_version = 1;
+      static const int patch_number = 0;
+      static const std::string feedback_version = boost::str(boost::format("%02d.%02d.%02d") 
+                                           % major_version % minor_version % patch_number);
 
     private:
       const ObservationSettings settings;
diff --git a/SAS/XSD/SAS/LofarBase.xsd b/SAS/XSD/SAS/LofarBase.xsd
index 84e9656811d01951dea626db94934810511385f9..20fa87e604336a740fd1857daaf192e74ee72524 100644
--- a/SAS/XSD/SAS/LofarBase.xsd
+++ b/SAS/XSD/SAS/LofarBase.xsd
@@ -405,6 +405,9 @@
 		</xsd:sequence>
 	</xsd:complexType>
 <!-- Calibration Pipeline related declarations -->
+<!-- FIXME: The Calibration Pipeline should have BbsParameters while the Averaging Pipeline does not, but for backward 
+compatibility with MoM it is currently not defined that way, making them identical. When support for MoM 3 can be dropped
+this should be fixed. -->
 	<xsd:complexType name="CalibrationPipeline">
 		<xsd:complexContent>
 			<xsd:extension base="AveragingPipeline"><!-- Untested if this works properly -->