diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/quality/baselinestatisticsmap.h b/CEP/DP3/AOFlagger/include/AOFlagger/quality/baselinestatisticsmap.h
index a00625b871ebe492c56d44eb27c970d6a1605721..b4839453d27ec98a44cdb29b3762579d5870c104 100644
--- a/CEP/DP3/AOFlagger/include/AOFlagger/quality/baselinestatisticsmap.h
+++ b/CEP/DP3/AOFlagger/include/AOFlagger/quality/baselinestatisticsmap.h
@@ -172,7 +172,7 @@ class BaselineStatisticsMap : public Serializable
 		void unserializeOuterMap(std::istream &stream, OuterMap &map) const
 		{
 			size_t size = UnserializeUInt32(stream);
-			for(size_t i=0;i<size;++i)
+			for(size_t j=0;j<size;++j)
 			{
 				unsigned antenna1 = UnserializeUInt32(stream);
 				
@@ -199,7 +199,7 @@ class BaselineStatisticsMap : public Serializable
 		void unserializeInnerMap(std::istream &stream, InnerMap &map) const
 		{
 			size_t size = UnserializeUInt32(stream);
-			for(size_t i=0;i<size;++i)
+			for(size_t j=0;j<size;++j)
 			{
 				unsigned antenna2 = UnserializeUInt32(stream);
 				
diff --git a/CEP/DP3/AOFlagger/src/msio/baselinematrixloader.cpp b/CEP/DP3/AOFlagger/src/msio/baselinematrixloader.cpp
index 763b97f602bcae3a8a73945853e29a69b48ef19f..36812b8dfec0ce95f35f16944f8b03ecdc9b28d2 100644
--- a/CEP/DP3/AOFlagger/src/msio/baselinematrixloader.cpp
+++ b/CEP/DP3/AOFlagger/src/msio/baselinematrixloader.cpp
@@ -121,7 +121,7 @@ TimeFrequencyData BaselineMatrixLoader::LoadSummed(size_t timeIndex)
 		yxMask = Mask2D::CreateUnsetMaskPtr(nrAntenna, nrAntenna),
 		yyMask = Mask2D::CreateUnsetMaskPtr(nrAntenna, nrAntenna);
 
-	for(size_t i=0;i<table.nrow();++i)
+	for(size_t j=0;j<table.nrow();++j)
 	{
 		int
 			a1 = *antenna1Iter,
diff --git a/CEP/DP3/AOFlagger/src/msio/directbaselinereader.cpp b/CEP/DP3/AOFlagger/src/msio/directbaselinereader.cpp
index 49dcea2e40d6c8a8fe8eddb693c8ba1846868655..08f32ef8a233df9bf3447075b558d237113e1eeb 100644
--- a/CEP/DP3/AOFlagger/src/msio/directbaselinereader.cpp
+++ b/CEP/DP3/AOFlagger/src/msio/directbaselinereader.cpp
@@ -252,13 +252,13 @@ std::vector<UVW> DirectBaselineReader::ReadUVW(unsigned antenna1, unsigned anten
 			timeIndex = allObservationTimes.find(time)->second;
 
 		casa::Array<double> arr = uvwColumn(rowIndex);
-		casa::Array<double>::const_iterator i = arr.begin();
+		casa::Array<double>::const_iterator j = arr.begin();
 		UVW &uvw = uvws[timeIndex];
-		uvw.u = *i;
-		++i;
-		uvw.v = *i;
-		++i;
-		uvw.w = *i;
+		uvw.u = *j;
+		++j;
+		uvw.v = *j;
+		++j;
+		uvw.w = *j;
 	}
 	
 	AOLogger::Debug << "Read of UVW took: " << stopwatch.ToString() << '\n';