diff --git a/src/libcalamaresui/utils/YamlUtils.cpp b/src/libcalamaresui/utils/YamlUtils.cpp
index 5003e98c74fd581d44a900dd8f0df3293b261bcb..313639537df87c8d950fed925dcb77f94cb37f14 100644
--- a/src/libcalamaresui/utils/YamlUtils.cpp
+++ b/src/libcalamaresui/utils/YamlUtils.cpp
@@ -24,7 +24,7 @@
 void
 operator>>( const YAML::Node& node, QStringList& v )
 {
-    for ( int i = 0; i < node.size(); ++i )
+    for ( size_t i = 0; i < node.size(); ++i )
     {
         v.append( QString::fromStdString( node[ i ].as< std::string >() ) );
     }
@@ -51,9 +51,11 @@ yamlToVariant( const YAML::Node& node )
         return yamlMapToVariant( node );
 
     case YAML::NodeType::Null:
+    case YAML::NodeType::Undefined:
         return QVariant();
     }
 
+    // NOTREACHED
     return QVariant();
 }