diff --git a/src/messages/text_document_completion.cc b/src/messages/text_document_completion.cc
index 961d0790..e2f25820 100644
--- a/src/messages/text_document_completion.cc
+++ b/src/messages/text_document_completion.cc
@@ -177,12 +177,11 @@ void FilterAndSortCompletionResponse(
   for (size_t i = 0; i < items.size(); ++i)
     items[i].sortText = tofixedbase64(i, buf);
 
-  // FIXME
-  // The trigger behivour of vscode is puzzling.
-  // So maybe it's not feasible to cut out any results.
-  // const size_t kMaxResultSize = 100u;
-  // if (items.size() > kMaxResultSize)
-  //   items.resize(kMaxResultSize);
+  const size_t kMaxResultSize = 100u;
+  if (items.size() > kMaxResultSize) {
+    items.resize(kMaxResultSize);
+    complete_response->result.isIncomplete = true;
+  }
 }
 
 struct TextDocumentCompletionHandler : MessageHandler {
diff --git a/wscript b/wscript
index 462cceac..382ea559 100644
--- a/wscript
+++ b/wscript
@@ -182,6 +182,9 @@ def configure(ctx):
     if 'release' in ctx.options.variant:
       cxxflags.append('-O' if 'asan' in ctx.options.variant else '-O3')
 
+  if ctx.env.CXX_NAME == 'clang' and 'debug' in ctx.options.variant:
+    cxxflags.append('-fno-limit-debug-info')
+
   ctx.env.CXXFLAGS = cxxflags
   if not ctx.env.LDFLAGS:
     ctx.env.LDFLAGS = ldflags