diff --git a/kcpp_adapters/AutoGuess.json b/kcpp_adapters/AutoGuess.json
index c84978ba5..be946d2a5 100644
--- a/kcpp_adapters/AutoGuess.json
+++ b/kcpp_adapters/AutoGuess.json
@@ -14,12 +14,12 @@
     "search": ["<|im_start|>assistant", "<|im_end|>", "You are provided with function signatures within <tools>"],
     "name": "ChatML (Qwen 2.5 based).",
     "adapter": {
-        "system_start": "<|im_start|>system\n\n",
-        "system_end": "<|im_end|>\n\n",
-        "user_start": "<|im_start|>user\n\n",
-        "user_end": "<|im_end|>\n\n",
-        "assistant_start": "<|im_start|>assistant\n\n",
-        "assistant_end": "<|im_end|>\n\n",
+        "system_start": "<|im_start|>system\n",
+        "system_end": "<|im_end|>\n",
+        "user_start": "<|im_start|>user\n",
+        "user_end": "<|im_end|>\n",
+        "assistant_start": "<|im_start|>assistant\n",
+        "assistant_end": "<|im_end|>\n",
         "tools_start": "\n\n# Tools\n\nYou may call one or more functions to assist with the user query.\n\nYou are provided with function signatures within <tools></tools> XML tags:\n\n<tools>\n",
         "tools_end": "\n</tools>\n\nFor each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:\n<tool_call>\n{\"name\": <function-name>, \"arguments\": <args-json-object>}\n</tool_call><|im_end|>\n"
     }
@@ -27,12 +27,12 @@
     "search": ["<|im_start|>assistant", "<|im_end|>"],
     "name": "ChatML (Generic).",
     "adapter": {
-        "system_start": "<|im_start|>system\n\n",
-        "system_end": "<|im_end|>\n\n",
-        "user_start": "<|im_start|>user\n\n",
-        "user_end": "<|im_end|>\n\n",
-        "assistant_start": "<|im_start|>assistant\n\n",
-        "assistant_end": "<|im_end|>\n\n"
+        "system_start": "<|im_start|>system\n",
+        "system_end": "<|im_end|>\n",
+        "user_start": "<|im_start|>user\n",
+        "user_end": "<|im_end|>\n",
+        "assistant_start": "<|im_start|>assistant\n",
+        "assistant_end": "<|im_end|>\n"
     }
 }, {
     "search": ["System role not supported", "<start_of_turn>"],
@@ -61,11 +61,11 @@
     "name": "Llama 3.x.",
     "adapter": {
         "system_start": "<|start_header_id|>system<|end_header_id|>\n\n",
-        "system_end": "<|eot_id|>\n\n",
+        "system_end": "<|eot_id|>",
         "user_start": "<|start_header_id|>user<|end_header_id|>\n\n",
-        "user_end": "<|eot_id|>\n\n",
+        "user_end": "<|eot_id|>",
         "assistant_start": "<|start_header_id|>assistant<|end_header_id|>\n\n",
-        "assistant_end": "<|eot_id|>\n\n"
+        "assistant_end": "<|eot_id|>"
     }
 }, {
     "search": ["<|header_start|>assistant<|header_end|>"],
diff --git a/tools/quantclip.cpp b/tools/quantclip.cpp
index e39add8ab..c816a7b45 100644
--- a/tools/quantclip.cpp
+++ b/tools/quantclip.cpp
@@ -1,7 +1,7 @@
 #include "ggml.h"
 #include "common.h"
-#include "clip.h"
-#include "llava.h"
+#include "mtmd/clip.h"
+#include "mtmd/llava.h"
 #include "llama.h"
 
 #include "base64.hpp"