diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ba712fad..79cc6b39c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ commands:
   build:
     steps:
       - run: make --keep-going --jobs 16 CXXFLAGS_EXTRA="-Werror" nas2d
-      - run: make --keep-going --jobs 16 CXXFLAGS_EXTRA="-Werror"
+      - run: make --keep-going --jobs 16 CXXFLAGS_EXTRA="-Werror" ophd
       - run: make --keep-going --jobs 16 CXXFLAGS_EXTRA="-Werror" testLibOPHD
       - run: make --keep-going --jobs 16 CXXFLAGS_EXTRA="-Werror" testLibControls
       - run: make --keep-going --jobs 16 CXXFLAGS_EXTRA="-Werror" checkOPHD
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0ba5275d1..5520a4240 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -168,5 +168,5 @@ jobs:
     - name: Run libOPHD unit tests
       run: .build/${{env.Configuration}}_${{env.Platform}}_testLibOPHD/testLibOPHD.exe
 
-    - name: Run libControl unit tests
+    - name: Run libControls unit tests
       run: .build/${{env.Configuration}}_${{env.Platform}}_testLibControls/testLibControls.exe
diff --git a/makefile b/makefile
index b380d240d..b5e8d0b7c 100644
--- a/makefile
+++ b/makefile
@@ -21,14 +21,16 @@ BUILDDIRPREFIX := $(ROOTBUILDDIR)/$(CONFIG)_Linux_
 
 ## Default and top-level targets ##
 
+.DEFAULT_GOAL := ophd
+
 .PHONY: all
-all: ophd$(EXE_SUFFIX)
+all: ophd test demoLibControls
 
 .PHONY: test
 test: testLibOPHD testLibControls
 
 .PHONY: check
-check: checkOPHD checkControls
+check: all checkOPHD checkControls
 
 
 ## NAS2D project ##
@@ -187,7 +189,7 @@ demoLibControls_PROJECT_FLAGS := $(demoLibControls_CPPFLAGS) $(CXXFLAGS)
 demoLibControls: $(demoLibControls_OUTPUT)
 
 .PHONY: runDemoControls
-runDemoControls:
+runDemoControls: $(demoLibControls_OUTPUT)
 	$(RUN_PREFIX) $(demoLibControls_OUTPUT)
 
 $(demoLibControls_OUTPUT): $(demoLibControls_OBJS) $(libControls_OUTPUT) $(NAS2DLIB)
@@ -202,7 +204,7 @@ include $(wildcard $(patsubst %.o,%.d,$(demoLibControls_OBJS)))
 
 ophd_SRCDIR := appOPHD/
 ophd_OBJDIR := $(BUILDDIRPREFIX)$(ophd_SRCDIR)Intermediate/
-ophd_OUTPUT := ophd$(EXE_SUFFIX)
+ophd_OUTPUT := $(BUILDDIRPREFIX)$(ophd_SRCDIR)ophd$(EXE_SUFFIX)
 ophd_SRCS := $(shell find $(ophd_SRCDIR) -name '*.cpp')
 ophd_OBJS := $(patsubst $(ophd_SRCDIR)%.cpp,$(ophd_OBJDIR)%.o,$(ophd_SRCS))
 
@@ -220,6 +222,13 @@ include $(wildcard $(patsubst %.o,%.d,$(ophd_OBJS)))
 .PHONY: intermediate
 intermediate: $(ophd_OBJS)
 
+.PHONY: ophd
+ophd: $(ophd_OUTPUT)
+
+.PHONY: run
+run: $(ophd_OUTPUT)
+	$(ophd_OUTPUT) $(OPHD_RUN_FLAGS)
+
 
 ## Compile rules ##