diff --git a/.vimrc b/.vimrc
index bab9024..405626c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,6 @@
 nnoremap <F1> :Make<cr>
 nnoremap <F2> :Make lint test<cr>
-nnoremap <F3> :Termdebug _build/debug/breakhack<cr>
+nnoremap <F3> :Termdebug LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./ _build/debug/breakhack<cr>
 nnoremap <F4> :ter ++close env LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./ ./_build/debug/breakhack<cr>
 
 packadd termdebug
diff --git a/Makefile b/Makefile
index d48b97a..1d4a9c6 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ test:
 .PHONY: test
 
 run: $(all)
-	@./_build/debug/breakhack
+	@LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./ ./_build/debug/breakhack
 .PHONY: run
 
 lint:
diff --git a/src/main.c b/src/main.c
index fee4e9e..7b8c84b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -625,7 +625,11 @@ handle_main_input(void)
 		switch (gGameState) {
 			case CREDITS:
 			case SCORE_SCREEN:
+				gGameState = MENU;
+				break;
 			case CHARACTER_MENU:
+				menu_destroy(charSelectMenu);
+				charSelectMenu = NULL;
 				gGameState = MENU;
 				break;
 			case MENU: