diff --git a/src/thread_base.cc b/src/thread_base.cc
index 8d1c5b79..4a023770 100644
--- a/src/thread_base.cc
+++ b/src/thread_base.cc
@@ -119,6 +119,8 @@ ThreadBase::ThreadBase() :
 }
 
 ThreadBase::~ThreadBase() {
+  delete m_pollManager;
+  delete m_threadQueue;
 }
 
 void
diff --git a/src/ui/element_file_list.cc b/src/ui/element_file_list.cc
index a4cbb162..eaac7fb5 100644
--- a/src/ui/element_file_list.cc
+++ b/src/ui/element_file_list.cc
@@ -89,7 +89,7 @@ element_file_list_create_info() {
   element->push_back("File info:");
   element->push_back("");
   
-  element->push_column("Filename:", te_command("fi.get_filename_last="));
+  element->push_column("Filename:", te_command("fi.filename_last="));
   element->push_back("");
   
   element->push_column("Size:",   te_command("if=$fi.is_file=,$convert.xb=$f.size_bytes=,---"));