diff --git a/apps/opencs/model/doc/messages.cpp b/apps/opencs/model/doc/messages.cpp
index 86e96a88d..76bbb6f22 100644
--- a/apps/opencs/model/doc/messages.cpp
+++ b/apps/opencs/model/doc/messages.cpp
@@ -1,6 +1,6 @@
 #include "messages.hpp"
 
-CSMDoc::Message::Message() {}
+CSMDoc::Message::Message() : mSeverity(Severity_Default){}
 
 CSMDoc::Message::Message (const CSMWorld::UniversalId& id, const std::string& message,
     const std::string& hint, Severity severity)
diff --git a/apps/opencs/model/doc/messages.hpp b/apps/opencs/model/doc/messages.hpp
index 429feae4e..4041e1a67 100644
--- a/apps/opencs/model/doc/messages.hpp
+++ b/apps/opencs/model/doc/messages.hpp
@@ -39,9 +39,6 @@ namespace CSMDoc
     {
         public:
 
-            // \deprecated Use CSMDoc::Message directly instead.
-            typedef CSMDoc::Message Message;
-
             typedef std::vector<Message> Collection;
 
             typedef Collection::const_iterator Iterator;
diff --git a/apps/opencs/model/doc/operationholder.cpp b/apps/opencs/model/doc/operationholder.cpp
index 5fcf24fe4..ccbed6c8b 100644
--- a/apps/opencs/model/doc/operationholder.cpp
+++ b/apps/opencs/model/doc/operationholder.cpp
@@ -2,7 +2,9 @@
 
 #include "operation.hpp"
 
-CSMDoc::OperationHolder::OperationHolder (Operation *operation) : mRunning (false)
+CSMDoc::OperationHolder::OperationHolder (Operation *operation)
+    : mOperation(NULL)
+    , mRunning (false)
 {
     if (operation)
         setOperation (operation);
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index 77a14de84..49de1d651 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -182,7 +182,7 @@ int CSMTools::ReportModel::countErrors() const
 {
     int count = 0;
 
-    for (std::vector<CSMDoc::Messages::Message>::const_iterator iter (mRows.begin());
+    for (std::vector<CSMDoc::Message>::const_iterator iter (mRows.begin());
         iter!=mRows.end(); ++iter)
         if (iter->mSeverity==CSMDoc::Message::Severity_Error ||
             iter->mSeverity==CSMDoc::Message::Severity_SeriousError)
diff --git a/apps/opencs/model/tools/reportmodel.hpp b/apps/opencs/model/tools/reportmodel.hpp
index 5704970f5..61b4e6307 100644
--- a/apps/opencs/model/tools/reportmodel.hpp
+++ b/apps/opencs/model/tools/reportmodel.hpp
@@ -16,7 +16,7 @@ namespace CSMTools
     {
             Q_OBJECT
 
-            std::vector<CSMDoc::Messages::Message> mRows;
+            std::vector<CSMDoc::Message> mRows;
 
             // Fixed columns
             enum Columns
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index d510cd103..097e83f7c 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -14,7 +14,7 @@
 
 CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
                                         const QVariant& new_, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false)
+    : QUndoCommand (parent), mModel (&model), mIndex (index), mNew (new_), mHasRecordState(false), mOldRecordState(CSMWorld::RecordBase::State_BaseOnly)
 {
     if (QAbstractProxyModel *proxy = dynamic_cast<QAbstractProxyModel *> (&model))
     {
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index 184477d6b..af90af50c 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -33,8 +33,9 @@
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
 : SceneWidget (document.getData().getResourceSystem(), parent), mSceneElements(0), mRun(0), mDocument(document),
-  mInteractionMask (0), mEditMode (0), mLocked (false), mDragging (false),
-  mToolTipPos (-1, -1)
+  mInteractionMask (0), mEditMode (0), mLocked (false), mDragging (false), mDragX(0), mDragY(0), mDragFactor(0),
+  mDragWheelFactor(0), mDragShiftFactor(0),
+  mToolTipPos (-1, -1), mShowToolTips(false), mToolTipDelay(0)
 {
     setAcceptDrops(true);
 
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 95dfa1034..26746e8c9 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -231,7 +231,7 @@ void CSVWorld::Table::mouseDoubleClickEvent (QMouseEvent *event)
 CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     bool createAndDelete, bool sorting, CSMDoc::Document& document)
 : DragRecordTable(document), mCreateAction (0),
-  mCloneAction(0),mRecordStatusDisplay (0)
+  mCloneAction(0), mRecordStatusDisplay (0), mJumpToAddedRecord(false), mUnselectAfterJump(false)
 {
     mModel = &dynamic_cast<CSMWorld::IdTableBase&> (*mDocument.getData().getTableModel (id));
 
diff --git a/apps/opencs/view/world/tablebottombox.cpp b/apps/opencs/view/world/tablebottombox.cpp
index eed522227..5a25bbc53 100644
--- a/apps/opencs/view/world/tablebottombox.cpp
+++ b/apps/opencs/view/world/tablebottombox.cpp
@@ -76,7 +76,7 @@ CSVWorld::TableBottomBox::TableBottomBox (const CreatorFactoryBase& creatorFacto
                                           CSMDoc::Document& document, 
                                           const CSMWorld::UniversalId& id, 
                                           QWidget *parent)
-: QWidget (parent), mShowStatusBar (false), mEditMode(EditMode_None), mHasPosition(false)
+: QWidget (parent), mShowStatusBar (false), mEditMode(EditMode_None), mHasPosition(false), mRow(0), mColumn(0)
 {
     for (int i=0; i<4; ++i)
         mStatusCount[i] = 0;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index b8dc90cf7..84da270eb 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1556,7 +1556,7 @@ namespace MWMechanics
                     (target == getPlayer() &&
                      MWBase::Environment::get().getWorld()->getGlobalInt("pcknownwerewolf")))
             {
-                const ESM::GameSetting * iWerewolfFightMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().search("iWerewolfFightMod");
+                const ESM::GameSetting * iWerewolfFightMod = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iWerewolfFightMod");
                 fight += iWerewolfFightMod->getInt();
             }
         }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 014c6b200..afb5be9d3 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -433,7 +433,7 @@ namespace MWWorld
         // Werewolf (BM)
         gmst["fWereWolfRunMult"] = ESM::Variant(1.f);
         gmst["fWereWolfSilverWeaponDamageMult"] = ESM::Variant(1.f);
-
+        gmst["iWerewolfFightMod"] = ESM::Variant(1);
 
         std::map<std::string, ESM::Variant> globals;
         // vanilla Morrowind does not define dayspassed.
@@ -1745,6 +1745,8 @@ namespace MWWorld
                 {
                     cellid.mWorldspace = ref.mRef.getDestCell();
                     cellid.mPaged = false;
+                    cellid.mIndex.mX = 0;
+                    cellid.mIndex.mY = 0;
                 }
                 else
                 {