diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 7054b78f9..d9d87fcdc 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'c-cpp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby' ]
+        language: [ 'c-cpp', 'go', 'javascript-typescript', 'python', 'ruby' ]
         # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
         # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
         # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
@@ -80,6 +80,7 @@ jobs:
         else \
           stat /home/runner/work/apple-gdb-1824/build; \
         fi
+        cd src
 
     - name: Dependencies
       if: matrix.language == 'c-cpp'
diff --git a/Makefile b/Makefile
index 6fb02b0df..3757bd0cc 100644
--- a/Makefile
+++ b/Makefile
@@ -884,6 +884,8 @@ build-core: configure
 	  test -n "$(MAKE)" && $(MAKE) configure; \
 	elif test -x "`which make`"; then \
 	  make configure; \
+	else \
+	  echo "unsure how to ensure that we have configure present..."; \
 	fi
 ifneq ($(NATIVE_TARGETS),)
 	$(SUBMAKE) $(patsubst %,$(OBJROOT)/%/stamp-build-core, $(NATIVE_TARGETS))