diff --git a/gpxsee.pro b/gpxsee.pro
index 7bc925fa..202a1cde 100644
--- a/gpxsee.pro
+++ b/gpxsee.pro
@@ -323,7 +323,6 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
     QT_NO_DEPRECATED_WARNINGS
 DEFINES *= QT_USE_QSTRINGBUILDER
 
-
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_en.ts \
     lang/gpxsee_cs.ts \
diff --git a/src/map/IMG/lblfile.cpp b/src/map/IMG/lblfile.cpp
index bd933475..39c463ed 100644
--- a/src/map/IMG/lblfile.cpp
+++ b/src/map/IMG/lblfile.cpp
@@ -102,7 +102,8 @@ Label LBLFile::label6b(Handle &hdl, quint32 offset) const
 					else if (c[cpt] == 0x1b)
 						curCharSet = Special;
 					else if (c[cpt] >= 0x2a && c[cpt] <= 0x2f) {
-						shieldType = (Label::Shield::Type)(c[cpt] - 0x29);
+						shieldType = static_cast<Label::Shield::Type>
+						  (c[cpt] - 0x29);
 						bap = &shieldLabel;
 					} else if (bap == &shieldLabel
 					  && NORMAL_CHARS[c[cpt]] == ' ')
@@ -145,7 +146,7 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset) const
 			else
 				bap->append(' ');
 		} else if (c <= 0x07) {
-			shieldType = (Label::Shield::Type)c;
+			shieldType = static_cast<Label::Shield::Type>(c);
 			bap = &shieldLabel;
 		} else if (bap == &shieldLabel && QChar(c).isSpace()) {
 			bap = &label;
diff --git a/src/map/imgmap.cpp b/src/map/imgmap.cpp
index 56680bc6..96406328 100644
--- a/src/map/imgmap.cpp
+++ b/src/map/imgmap.cpp
@@ -381,8 +381,9 @@ void IMGMap::processLines(QList<IMG::Poly> &lines, const QPoint &tile,
 	}
 
 
-	for (int type = 1; type < 7; type++) {
-		if (minShieldZoom((Label::Shield::Type)type) > _zoom)
+	for (int type = Label::Shield::USInterstate; type <= Label::Shield::Oval;
+	  type++) {
+		if (minShieldZoom(static_cast<Label::Shield::Type>(type)) > _zoom)
 			continue;
 
 		QSet<Label::Shield> shields;