diff --git a/src/libvgcode/src/Settings.hpp b/src/libvgcode/src/Settings.hpp
index bc5f28514a..37ddb5a8b9 100644
--- a/src/libvgcode/src/Settings.hpp
+++ b/src/libvgcode/src/Settings.hpp
@@ -67,6 +67,7 @@ struct Settings
 		        true, // InternalBridgeInfill
 		        true, // Brim
 		        true, // SupportTransition
+		        true, // Mixed
 		};
 };
 
diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp
index cd3077efb3..a9b6b7ae81 100644
--- a/src/libvgcode/src/ViewerImpl.cpp
+++ b/src/libvgcode/src/ViewerImpl.cpp
@@ -301,6 +301,7 @@ static const std::array<Color, size_t(EGCodeExtrusionRole::COUNT)> DEFAULT_EXTRU
     {  77, 128, 186 }, // InternalBridgeInfill
     {   0,  59, 110 }, // Brim
     {   0,  64,   0 }, // SupportTransition
+    { 128, 128, 128 }, // Mixed
 } };
 
 static const std::array<Color, size_t(EOptionType::COUNT)> DEFAULT_OPTIONS_COLORS{ {
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 7b46443149..0774d06324 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -1219,7 +1219,7 @@ void GCodeViewer::load_as_gcode(const GCodeProcessorResult& gcode_result, const
 
     //BBS
     m_conflict_result = gcode_result.conflict_result;
-    if (m_conflict_result) { m_conflict_result.value().layer = m_viewer.get_layer_id_at(m_conflict_result.value()._height); }
+    if (m_conflict_result) { m_conflict_result.value().layer = m_viewer.get_layer_id_at(static_cast<float>(m_conflict_result.value()._height)); }
 
     m_gcode_check_result = gcode_result.gcode_check_result;
 
@@ -2015,7 +2015,7 @@ void GCodeViewer::render_toolpaths()
         if (ImGui::BeginTable("Data", 2)) {
             ImGui::TableNextRow();
             ImGui::TableSetColumnIndex(0);
-            ImGuiWrapper::text_colored(ImGuiWrapper.COL_ORANGE_LIGHT, "# vertices");
+            ImGuiWrapper::text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, "# vertices");
             ImGui::TableSetColumnIndex(1);
             ImGuiWrapper::text(std::to_string(m_viewer.get_vertices_count()));
 
@@ -4026,7 +4026,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
             }
             ImGui::SameLine(max_len);
             char buf[64];
-            int layer = m_viewer.get_layer_id_at(m_viewer.get_layer_id_at(custom_gcode.print_z));
+            int layer = m_viewer.get_layer_id_at(custom_gcode.print_z);
             ::sprintf(buf, "%d",layer );
             imgui.text(buf);
             ImGui::SameLine(max_len * 1.5);