diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 7267c9c8b..3c24b64a5 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -20,7 +20,7 @@ namespace CSMWorld
 {
     class IdTable;
     class IdTable;
-    class RecordBase;
+    struct RecordBase;
 
     class ModifyCommand : public QUndoCommand
     {
diff --git a/apps/opencs/model/world/idtable.hpp b/apps/opencs/model/world/idtable.hpp
index 707d7133b..ea8ab80f9 100644
--- a/apps/opencs/model/world/idtable.hpp
+++ b/apps/opencs/model/world/idtable.hpp
@@ -10,7 +10,7 @@
 namespace CSMWorld
 {
     class CollectionBase;
-    class RecordBase;
+    struct RecordBase;
 
     class IdTable : public IdTableBase
     {
diff --git a/apps/opencs/model/world/refidadapter.hpp b/apps/opencs/model/world/refidadapter.hpp
index 3320af190..74c5dfe58 100644
--- a/apps/opencs/model/world/refidadapter.hpp
+++ b/apps/opencs/model/world/refidadapter.hpp
@@ -9,7 +9,7 @@ namespace CSMWorld
 {
     class RefIdColumn;
     class RefIdData;
-    class RecordBase;
+    struct RecordBase;
 
     class RefIdAdapter
     {
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 3ed4fa793..c5a2b73c2 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -17,7 +17,7 @@ namespace Ogre
 namespace CSMWorld
 {
     class Data;
-    class CellRef;
+    struct CellRef;
 }
 
 namespace CSVWorld
diff --git a/apps/opencs/view/tools/reporttable.cpp b/apps/opencs/view/tools/reporttable.cpp
index da15b4acc..da39c1983 100644
--- a/apps/opencs/view/tools/reporttable.cpp
+++ b/apps/opencs/view/tools/reporttable.cpp
@@ -30,7 +30,7 @@ void CSVTools::ReportTable::contextMenuEvent (QContextMenuEvent *event)
 void CSVTools::ReportTable::mouseMoveEvent (QMouseEvent *event)
 {
     if (event->buttons() & Qt::LeftButton)
-        startDrag (*this);
+        startDragToTable (*this);
 }
 
 void CSVTools::ReportTable::mouseDoubleClickEvent (QMouseEvent *event)
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 48009da8d..e383f5e9a 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -40,8 +40,12 @@ QAbstractItemDelegate(parent),
 mTable(table)
 {}
 
-void CSVWorld::NotEditableSubDelegate::setEditorData (QLabel* editor, const QModelIndex& index) const
+void CSVWorld::NotEditableSubDelegate::setEditorData (QWidget* editor, const QModelIndex& index) const
 {
+    QLabel* label = qobject_cast<QLabel*>(editor);
+    if(!label)
+        return;
+
     QVariant v = index.data(Qt::EditRole);
     if (!v.isValid())
     {
@@ -54,16 +58,17 @@ void CSVWorld::NotEditableSubDelegate::setEditorData (QLabel* editor, const QMod
 
     if (QVariant::String == v.type())
     {
-        editor->setText(v.toString());
-    } else //else we are facing enums
+        label->setText(v.toString());
+    }
+    else //else we are facing enums
     {
         int data = v.toInt();
         std::vector<std::string> enumNames (CSMWorld::Columns::getEnums (static_cast<CSMWorld::Columns::ColumnId> (mTable->getColumnId (index.column()))));
-        editor->setText(QString::fromUtf8(enumNames.at(data).c_str()));
+        label->setText(QString::fromUtf8(enumNames.at(data).c_str()));
     }
 }
 
-void CSVWorld::NotEditableSubDelegate::setModelData (QWidget* editor, QAbstractItemModel* model, const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
+void CSVWorld::NotEditableSubDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
     //not editable widgets will not save model data
 }
@@ -80,8 +85,7 @@ QSize CSVWorld::NotEditableSubDelegate::sizeHint (const QStyleOptionViewItem& op
 
 QWidget* CSVWorld::NotEditableSubDelegate::createEditor (QWidget *parent,
                                 const QStyleOptionViewItem& option,
-                                const QModelIndex& index,
-                                CSMWorld::ColumnBase::Display display) const
+                                const QModelIndex& index) const
 {
     return new QLabel(parent);
 }
@@ -224,6 +228,11 @@ void CSVWorld::DialogueDelegateDispatcher::setEditorData (QWidget* editor, const
     }
 }
 
+void CSVWorld::DialogueDelegateDispatcher::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+{
+    setModelData(editor, model, index, CSMWorld::ColumnBase::Display_None);
+}
+
 void CSVWorld::DialogueDelegateDispatcher::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
 {
     std::map<int, CommandDelegate*>::const_iterator delegateIt(mDelegates.find(display));
@@ -258,7 +267,7 @@ QWidget* CSVWorld::DialogueDelegateDispatcher::makeEditor(CSMWorld::ColumnBase::
     QWidget* editor = NULL;
     if (! (mTable->flags (index) & Qt::ItemIsEditable))
     {
-        return mNotEditableDelegate.createEditor(qobject_cast<QWidget*>(mParent), QStyleOptionViewItem(), index, display);
+        return mNotEditableDelegate.createEditor(qobject_cast<QWidget*>(mParent), QStyleOptionViewItem(), index);
     }
 
     std::map<int, CommandDelegate*>::iterator delegateIt(mDelegates.find(display));
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index 5de2c3ad2..5bd226960 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -40,9 +40,9 @@ namespace CSVWorld
     public:
         NotEditableSubDelegate(const CSMWorld::IdTable* table, QObject * parent = 0);
 
-        virtual void setEditorData (QLabel* editor, const QModelIndex& index) const;
+        virtual void setEditorData (QWidget* editor, const QModelIndex& index) const;
 
-        virtual void setModelData (QWidget* editor, QAbstractItemModel* model, const QModelIndex& index, CSMWorld::ColumnBase::Display display) const;
+        virtual void setModelData (QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const;
 
         virtual void paint (QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
         ///< does nothing
@@ -52,8 +52,7 @@ namespace CSVWorld
 
         virtual QWidget *createEditor (QWidget *parent,
                                 const QStyleOptionViewItem& option,
-                                const QModelIndex& index,
-                                CSMWorld::ColumnBase::Display display = CSMWorld::ColumnBase::Display_None) const;
+                                const QModelIndex& index) const;
     };
 
     //this can't be nested into the DialogueDelegateDispatcher, because it needs to emit signals
@@ -119,6 +118,8 @@ namespace CSVWorld
 
         virtual void setEditorData (QWidget* editor, const QModelIndex& index) const;
 
+        virtual void setModelData (QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const;
+
         virtual void setModelData (QWidget* editor, QAbstractItemModel* model, const QModelIndex& index, CSMWorld::ColumnBase::Display display) const;
 
         virtual void paint (QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp
index c33fa58ad..f9cc4b530 100644
--- a/apps/opencs/view/world/dragrecordtable.cpp
+++ b/apps/opencs/view/world/dragrecordtable.cpp
@@ -3,7 +3,7 @@
 #include "../../model/world/tablemimedata.hpp"
 #include "dragrecordtable.hpp"
 
-void CSVWorld::DragRecordTable::startDrag (const CSVWorld::DragRecordTable& table)
+void CSVWorld::DragRecordTable::startDragToTable (const CSVWorld::DragRecordTable& table)
 {
     CSMWorld::TableMimeData* mime = new CSMWorld::TableMimeData (table.getDraggedRecords(), mDocument);
 
diff --git a/apps/opencs/view/world/dragrecordtable.hpp b/apps/opencs/view/world/dragrecordtable.hpp
index 8c5f1b841..5b7e68490 100644
--- a/apps/opencs/view/world/dragrecordtable.hpp
+++ b/apps/opencs/view/world/dragrecordtable.hpp
@@ -33,7 +33,7 @@ namespace CSVWorld
             void setEditLock(bool locked);
 
         protected:
-            void startDrag(const DragRecordTable& table);
+            void startDragToTable(const DragRecordTable& table);
 
             void dragEnterEvent(QDragEnterEvent *event);
 
diff --git a/apps/opencs/view/world/enumdelegate.cpp b/apps/opencs/view/world/enumdelegate.cpp
index 168e5cb0a..7c305b1b6 100644
--- a/apps/opencs/view/world/enumdelegate.cpp
+++ b/apps/opencs/view/world/enumdelegate.cpp
@@ -46,7 +46,6 @@ QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent,
                                               const QModelIndex& index) const
 {
     return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_None);
-    //overloading virtual functions is HARD
 }
 
 QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem& option,
diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index 9497e4054..316c61a88 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -345,7 +345,7 @@ void CSVWorld::RegionMap::viewInTable()
 
 void CSVWorld::RegionMap::mouseMoveEvent (QMouseEvent* event)
 {
-    startDrag(*this);
+    startDragToTable(*this);
 }
 
 std::vector< CSMWorld::UniversalId > CSVWorld::RegionMap::getDraggedRecords() const
@@ -400,7 +400,7 @@ void CSVWorld::RegionMap::dropEvent (QDropEvent* event)
         QModelIndex index2(cellsModel->getModelIndex (cellId,
             cellsModel->findColumnIndex (CSMWorld::Columns::ColumnId_Region)));
 
-        mDocument.getUndoStack().push(new CSMWorld::ModifyCommand 
+        mDocument.getUndoStack().push(new CSMWorld::ModifyCommand
                                         (*cellsModel, index2, QString::fromUtf8(record.getId().c_str())));
 
         mRegionId = record.getId();
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index e864e4ed2..7b8b97bc8 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -635,7 +635,7 @@ void CSVWorld::Table::mouseMoveEvent (QMouseEvent* event)
 {
     if (event->buttons() & Qt::LeftButton)
     {
-        startDrag(*this);
+        startDragToTable(*this);
     }
 }
 
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 91460c3df..b0f8a035a 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -139,6 +139,12 @@ void CSVWorld::CommandDelegate::setModelData (QWidget *editor, QAbstractItemMode
     ///< \todo provide some kind of feedback to the user, indicating that editing is currently not possible.
 }
 
+QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleOptionViewItem& option,
+    const QModelIndex& index) const
+{
+    return createEditor (parent, option, index, CSMWorld::ColumnBase::Display_None);
+}
+
 QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleOptionViewItem& option,
     const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
 {
@@ -230,6 +236,11 @@ bool CSVWorld::CommandDelegate::isEditLocked() const
     return mEditLock;
 }
 
+void CSVWorld::CommandDelegate::setEditorData (QWidget *editor, const QModelIndex& index) const
+{
+    setEditorData (editor, index, false);
+}
+
 void CSVWorld::CommandDelegate::setEditorData (QWidget *editor, const QModelIndex& index, bool tryDisplay) const
 {
     QVariant v = index.data(Qt::EditRole);
diff --git a/apps/opencs/view/world/util.hpp b/apps/opencs/view/world/util.hpp
index b4d972bf3..10011798d 100644
--- a/apps/opencs/view/world/util.hpp
+++ b/apps/opencs/view/world/util.hpp
@@ -130,10 +130,14 @@ namespace CSVWorld
             virtual void setModelData (QWidget *editor, QAbstractItemModel *model,
                 const QModelIndex& index) const;
 
+            virtual QWidget *createEditor (QWidget *parent,
+                                           const QStyleOptionViewItem& option,
+                                           const QModelIndex& index) const;
+
             virtual QWidget *createEditor (QWidget *parent,
                                            const QStyleOptionViewItem& option,
                                            const QModelIndex& index,
-                                           CSMWorld::ColumnBase::Display display = CSMWorld::ColumnBase::Display_None) const;
+                                           CSMWorld::ColumnBase::Display display) const;
 
             void setEditLock (bool locked);
 
@@ -141,8 +145,9 @@ namespace CSVWorld
 
             ///< \return Does column require update?
 
-            virtual void setEditorData (QWidget *editor, const QModelIndex& index, bool tryDisplay = false) const;
+            virtual void setEditorData (QWidget *editor, const QModelIndex& index) const;
 
+            virtual void setEditorData (QWidget *editor, const QModelIndex& index, bool tryDisplay) const;
 
         public slots: