diff --git a/src/debug.cc b/src/debug.cc
index a617295..463be8d 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -262,8 +262,9 @@ std::vector<Debug::Frame> Debug::get_backtrace() {
     for(uint32_t c_f=0;c_f<thread.GetNumFrames();c_f++) {
       Frame backtrace_frame;
       auto frame=thread.GetFrameAtIndex(c_f);
-      if(frame.GetFunction().IsValid())
-        backtrace_frame.function_name=frame.GetFunctionName();
+      auto function_name=frame.GetFunctionName();
+      if(function_name!=NULL)
+        backtrace_frame.function_name=function_name;
       auto line_entry=frame.GetLineEntry();
       if(line_entry.IsValid()) {
         lldb::SBStream stream;
diff --git a/src/files.h b/src/files.h
index 1556da7..d50436e 100644
--- a/src/files.h
+++ b/src/files.h
@@ -103,10 +103,10 @@ const std::string configjson =
 "        \"debug_start_continue\": \"<primary>y\",\n"
 "        \"debug_stop\": \"<primary><shift>y\",\n"
 "        \"debug_kill\": \"<primary><shift>k\",\n"
-"        \"debug_step_over\": \"<primary>h\",\n"
+"        \"debug_step_over\": \"<primary>j\",\n"
 "        \"debug_step_into\": \"<primary>t\",\n"
 "        \"debug_step_out\": \"<primary><shift>t\",\n"
-"        \"debug_backtrace\": \"<primary><shift>h\",\n"
+"        \"debug_backtrace\": \"<primary><shift>j\",\n"
 "        \"debug_run_command\": \"<alt><shift>Return\",\n"
 "        \"debug_toggle_breakpoint\": \"<primary>b\",\n"
 "        \"debug_goto_stop\": \"<primary><shift>l\",\n"