diff --git a/src/data/data.cpp b/src/data/data.cpp
index 24dcd45f..f8cac22e 100644
--- a/src/data/data.cpp
+++ b/src/data/data.cpp
@@ -23,13 +23,13 @@ static QHash<QString, Parser*> parsers()
 {
 	QHash<QString, Parser*> hash;
 
-        hash.insert("gpx", &gpx);
-        hash.insert("tcx", &tcx);
-        hash.insert("kml", &kml);
-        hash.insert("fit", &fit);
-        hash.insert("csv", &csv);
-        hash.insert("igc", &igc);
-        hash.insert("nmea", &nmea);
+	hash.insert("gpx", &gpx);
+	hash.insert("tcx", &tcx);
+	hash.insert("kml", &kml);
+	hash.insert("fit", &fit);
+	hash.insert("csv", &csv);
+	hash.insert("igc", &igc);
+	hash.insert("nmea", &nmea);
 
 	return hash;
 }
diff --git a/src/map/projection.h b/src/map/projection.h
index 2a849ba6..6bb1f894 100644
--- a/src/map/projection.h
+++ b/src/map/projection.h
@@ -87,8 +87,8 @@ public:
 	const LinearUnits &units() const {return _units;}
 
 private:
-	const GCS * _gcs;
-	CT *_ct;
+	const GCS *_gcs;
+	const CT *_ct;
 	LinearUnits _units;
 	bool _geographic;
 };
diff --git a/src/map/utm.h b/src/map/utm.h
index 59bdb402..cb345431 100644
--- a/src/map/utm.h
+++ b/src/map/utm.h
@@ -3,11 +3,10 @@
 
 #include "projection.h"
 
-class UTM
+namespace UTM
 {
-public:
-	static int zone(const Coordinates &c);
-	static Projection::Setup setup(int zone);
-};
+	int zone(const Coordinates &c);
+	Projection::Setup setup(int zone);
+}
 
 #endif // UTM_H