diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp
index 4d77ff02f..fb1e5bcb2 100644
--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@@ -77,7 +77,7 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
     }
 }
 
-std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::vector< std::string > >& seekedString)
+std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::vector< std::string > >& seekedString) const
 {
     const unsigned columns = seekedString.second.size();
 
diff --git a/apps/opencs/view/filter/editwidget.hpp b/apps/opencs/view/filter/editwidget.hpp
index f39b0f8e3..da99c4031 100644
--- a/apps/opencs/view/filter/editwidget.hpp
+++ b/apps/opencs/view/filter/editwidget.hpp
@@ -34,7 +34,7 @@ namespace CSVFilter
             void filterChanged (boost::shared_ptr<CSMFilter::Node> filter);
 
     private:
-            std::string generateFilter(std::pair<std::string, std::vector<std::string> >& seekedString);
+            std::string generateFilter(std::pair<std::string, std::vector<std::string> >& seekedString) const;
 
         private slots:
 
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 2642777cf..fd0ba0f19 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -510,7 +510,7 @@ void CSVWorld::Table::dragMoveEvent(QDragMoveEvent *event)
 
 std::vector<std::string> CSVWorld::Table::getColumnsWithDisplay(CSMWorld::ColumnBase::Display display) const
 {
-    int count = mModel->columnCount();
+    const int count = mModel->columnCount();
 
     std::vector<std::string> titles;
     for (int i = 0; i < count; ++i)