diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 3123308efe..c123ace441 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -694,7 +694,7 @@ void Record<ESM::Dialogue>::print()
     // loads, rather than loading and then dumping. :-( Anyone mind if
     // I change this?
     ESM::Dialogue::InfoContainer::iterator iit;
-    for (iit = mData.mInfo.begin(); iit != mData.mInfo.end(); iit++)
+    for (iit = mData.mInfo.begin(); iit != mData.mInfo.end(); ++iit)
         std::cout << "INFO!" << iit->mId << std::endl;
 }
 
@@ -1123,7 +1123,7 @@ void Record<ESM::Pathgrid>::print()
 
     int i = 0;
     ESM::Pathgrid::PointList::iterator pit;
-    for (pit = mData.mPoints.begin(); pit != mData.mPoints.end(); pit++)
+    for (pit = mData.mPoints.begin(); pit != mData.mPoints.end(); ++pit)
     {
         std::cout << "  Point[" << i << "]:" << std::endl;
         std::cout << "    Coordinates: (" << pit->mX << ","
@@ -1135,7 +1135,7 @@ void Record<ESM::Pathgrid>::print()
     }
     i = 0;
     ESM::Pathgrid::EdgeList::iterator eit;
-    for (eit = mData.mEdges.begin(); eit != mData.mEdges.end(); eit++)
+    for (eit = mData.mEdges.begin(); eit != mData.mEdges.end(); ++eit)
     {
         std::cout << "  Edge[" << i << "]: " << eit->mV0 << " -> " << eit->mV1 << std::endl;
         if (eit->mV0 >= mData.mData.mS2 || eit->mV1 >= mData.mData.mS2)
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index 72393db40b..572a58f267 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -33,12 +33,12 @@ bool hasExtension(std::string filename, std::string  extensionToFind)
 }
 
 ///See if the file has the "nif" extension.
-bool isNIF(std::string filename)
+bool isNIF(const std::string & filename)
 {
     return hasExtension(filename,"nif");
 }
 ///See if the file has the "bsa" extension.
-bool isBSA(std::string filename)
+bool isBSA(const std::string & filename)
 {
     return hasExtension(filename,"bsa");
 }
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index d2bedc666e..d2a4f2a356 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -579,7 +579,7 @@ bool CSMFilter::Parser::parse (const std::string& filter, bool allowPredefined)
     }
     // We do not use isString() here, because there could be a pre-defined filter with an ID that is
     // equal a filter keyword.
-    else if (token.mType==Token::Type_String && allowPredefined)
+    else if (token.mType==Token::Type_String)
     {
         if (getNextToken()!=Token (Token::Type_EOS))
         {
diff --git a/apps/opencs/model/prefs/boolsetting.cpp b/apps/opencs/model/prefs/boolsetting.cpp
index 6431dc6af3..14fdbc818c 100644
--- a/apps/opencs/model/prefs/boolsetting.cpp
+++ b/apps/opencs/model/prefs/boolsetting.cpp
@@ -22,6 +22,8 @@ CSMPrefs::BoolSetting& CSMPrefs::BoolSetting::setTooltip (const std::string& too
 
 std::pair<QWidget *, QWidget *> CSMPrefs::BoolSetting::makeWidgets (QWidget *parent)
 {
+    if (mWidget != nullptr)
+        delete mWidget;
     mWidget = new QCheckBox (QString::fromUtf8 (getLabel().c_str()), parent);
     mWidget->setCheckState (mDefault ? Qt::Checked : Qt::Unchecked);
 
diff --git a/apps/opencs/model/prefs/shortcuteventhandler.cpp b/apps/opencs/model/prefs/shortcuteventhandler.cpp
index 93e2d85d3d..e42cb5da1f 100644
--- a/apps/opencs/model/prefs/shortcuteventhandler.cpp
+++ b/apps/opencs/model/prefs/shortcuteventhandler.cpp
@@ -49,7 +49,7 @@ namespace CSMPrefs
         ShortcutMap::iterator shortcutListIt = mWidgetShortcuts.find(widget);
         if (shortcutListIt != mWidgetShortcuts.end())
         {
-            std::remove(shortcutListIt->second.begin(), shortcutListIt->second.end(), shortcut);
+            shortcutListIt->second.erase(std::remove(shortcutListIt->second.begin(), shortcutListIt->second.end(), shortcut), shortcutListIt->second.end());
         }
     }
 
diff --git a/apps/opencs/model/tools/pathgridcheck.cpp b/apps/opencs/model/tools/pathgridcheck.cpp
index 3cd4a1b09c..be4d37792f 100644
--- a/apps/opencs/model/tools/pathgridcheck.cpp
+++ b/apps/opencs/model/tools/pathgridcheck.cpp
@@ -29,7 +29,7 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Pathgrid, pathgrid.mId);
 
     // check the number of pathgrid points
-    if (pathgrid.mData.mS2 > static_cast<int>(pathgrid.mPoints.size()))
+    if (pathgrid.mData.mS2 < static_cast<int>(pathgrid.mPoints.size()))
         messages.add (id, pathgrid.mId + " has less points than expected", "", CSMDoc::Message::Severity_Error);
     else if (pathgrid.mData.mS2 > static_cast<int>(pathgrid.mPoints.size()))
         messages.add (id, pathgrid.mId + " has more points than expected", "", CSMDoc::Message::Severity_Error);
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index 6b586dcec1..8ecf58e84d 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -24,7 +24,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
     bool isDeleted = false;
 
     // hack to initialise mindex
-    while (!(mref.mRefNum.mIndex = 0) && ESM::Cell::getNextRef(reader, ref, isDeleted, true, &mref))
+    while (!(mref.mRefNum.mIndex == 0) && ESM::Cell::getNextRef(reader, ref, isDeleted, true, &mref))
     {
         // Keep mOriginalCell empty when in modified (as an indicator that the
         // original cell will always be equal the current cell).
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index e8f9215800..3d0c874f99 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -1373,10 +1373,8 @@ QVariant CSMWorld::CreatureAttackRefIdAdapter::getNestedData (const RefIdColumn
 
     if (subColIndex == 0)
         return subRowIndex + 1;
-    else if (subColIndex < 3) // 1 or 2
+    else // 1 or 2
         return creature.mData.mAttack[(subRowIndex * 2) + (subColIndex - 1)];
-    else
-        return QVariant(); // throw an exception here?
 }
 
 void CSMWorld::CreatureAttackRefIdAdapter::setNestedData (const RefIdColumn *column,
diff --git a/apps/opencs/view/doc/loader.cpp b/apps/opencs/view/doc/loader.cpp
index 713295d702..49a53e1794 100644
--- a/apps/opencs/view/doc/loader.cpp
+++ b/apps/opencs/view/doc/loader.cpp
@@ -167,7 +167,7 @@ void CSVDoc::Loader::loadingStopped (CSMDoc::Document *document, bool completed,
         delete iter->second;
         mDocuments.erase (iter);
     }
-    else if (!completed && !error.empty())
+    else
     {
         iter->second->abort (error);
         // Leave the window open for now (wait for the user to close it)
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 1363f489a2..e939b9baf0 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -63,19 +63,9 @@ std::string CSVWorld::ReferenceCreator::getErrors() const
     std::string cell = mCell->text().toUtf8().constData();
 
     if (cell.empty())
-    {
-        if (!errors.empty())
-            errors += "<br>";
-
         errors += "Missing Cell ID";
-    }
     else if (getData().getCells().searchId (cell)==-1)
-    {
-        if (!errors.empty())
-            errors += "<br>";
-
         errors += "Invalid Cell ID";
-    }
 
     return errors;
 }
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 0776706d8c..6071863b5d 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -558,7 +558,7 @@ namespace
             if (mAllQuests)
             {
                 SetNamesInactive setInactive(list);
-                mModel->visitQuestNames(!mAllQuests, setInactive);
+                mModel->visitQuestNames(false, setInactive);
             }
 
             MWBase::Environment::get().getWindowManager()->playSound("book page");
diff --git a/apps/openmw/mwgui/referenceinterface.cpp b/apps/openmw/mwgui/referenceinterface.cpp
index 6213d9e257..83221c4f4b 100644
--- a/apps/openmw/mwgui/referenceinterface.cpp
+++ b/apps/openmw/mwgui/referenceinterface.cpp
@@ -15,11 +15,8 @@ namespace MWGui
         // check if count of the reference has become 0
         if (!mPtr.isEmpty() && mPtr.getRefData().getCount() == 0)
         {
-            if (!mPtr.isEmpty())
-            {
-                mPtr = MWWorld::Ptr();
-                onReferenceUnavailable();
-            }
+            mPtr = MWWorld::Ptr();
+            onReferenceUnavailable();
         }
     }
 }
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 45767bf01d..013c39b153 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -532,12 +532,11 @@ namespace MWGui
             assignWidget(mBarTextWidget, "BarText");
         }
 
-        MWScrollBar::MWScrollBar()
-            : mEnableRepeat(true)
-            , mRepeatTriggerTime(0.5f)
-            , mRepeatStepTime(0.1f)
-            , mIsIncreasing(true)
+        MWScrollBar::MWScrollBar() : mIsIncreasing(true)
         {
+            mEnableRepeat = true;
+            mRepeatTriggerTime = 0.5f;
+            mRepeatStepTime = 0.1f;
 #if MYGUI_VERSION >= MYGUI_DEFINE_VERSION(3,2,2)
             ScrollBar::setRepeatEnabled(false);
 #endif
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 6d9c0a580c..67a6d705cb 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -315,9 +315,6 @@ namespace MWGui
             virtual void initialiseOverride();
             void repeatClick(MyGUI::Widget* _widget, MyGUI::ControllerItem* _controller);
 
-            bool mEnableRepeat;
-            float mRepeatTriggerTime;
-            float mRepeatStepTime;
             bool mIsIncreasing;
 
         private:
diff --git a/apps/openmw/mwgui/windowbase.cpp b/apps/openmw/mwgui/windowbase.cpp
index a0e7eeddeb..93440a50a8 100644
--- a/apps/openmw/mwgui/windowbase.cpp
+++ b/apps/openmw/mwgui/windowbase.cpp
@@ -25,7 +25,7 @@ void WindowBase::setVisible(bool visible)
 
     if (visible)
         onOpen();
-    else if (wasVisible && !visible)
+    else if (wasVisible)
         onClose();
 
     // This is needed as invisible widgets can retain key focus.
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 2f32a6570c..7990373a72 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1422,7 +1422,7 @@ namespace MWMechanics
                                 MWBase::Environment::get().getWindowManager()->setSneakVisibility(false);
                                 break;
                             }
-                            else if (!detected)
+                            else
                                 avoidedNotice = true;
                         }
                     }
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index f88b20a101..06e0a42d7e 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -517,8 +517,7 @@ void CharacterController::refreshMovementAnims(const WeaponInfo* weap, Character
 
 void CharacterController::refreshIdleAnims(const WeaponInfo* weap, CharacterState idle, bool force)
 {
-    if(force || idle != mIdleState ||
-        ((idle == mIdleState) && !mAnimation->isPlaying(mCurrentIdle) && mAnimQueue.empty()))
+    if(force || idle != mIdleState || (!mAnimation->isPlaying(mCurrentIdle) && mAnimQueue.empty()))
     {
         mIdleState = idle;
         size_t numLoops = ~0ul;
@@ -1189,7 +1188,7 @@ bool CharacterController::updateWeaponState()
         std::string weapgroup;
         if(weaptype == WeapType_None)
         {
-            if ((!isWerewolf || mWeaponType != WeapType_Spell))
+            if (!isWerewolf || mWeaponType != WeapType_Spell)
             {
                 getWeaponGroup(mWeaponType, weapgroup);
                 mAnimation->play(weapgroup, priorityWeapon,
@@ -2152,7 +2151,7 @@ bool CharacterController::playGroup(const std::string &groupname, int mode, int
                             MWRender::Animation::BlendMask_All, false, 1.0f,
                             ((mode==2) ? "loop start" : "start"), "stop", 0.0f, count-1, loopfallback);
     }
-    else if(mode == 0)
+    else
     {
         mAnimQueue.resize(1);
         mAnimQueue.push_back(entry);
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 1dccb6c9a7..9d3fa2297f 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -314,17 +314,14 @@ namespace MWMechanics
         {
             const ESM::Pathgrid::Point oldStart(*getPath().begin());
             buildPath(startPoint, endPoint, cell, pathgridGraph);
-            if (mPath.size() >= 2)
+            // if 2nd waypoint of new path == 1st waypoint of old, 
+            // delete 1st waypoint of new path.
+            std::list<ESM::Pathgrid::Point>::iterator iter = ++mPath.begin();
+            if (iter->mX == oldStart.mX
+                && iter->mY == oldStart.mY
+                && iter->mZ == oldStart.mZ)
             {
-                // if 2nd waypoint of new path == 1st waypoint of old, 
-                // delete 1st waypoint of new path.
-                std::list<ESM::Pathgrid::Point>::iterator iter = ++mPath.begin();
-                if (iter->mX == oldStart.mX
-                    && iter->mY == oldStart.mY
-                    && iter->mZ == oldStart.mZ)
-                {
-                    mPath.pop_front();
-                }
+                mPath.pop_front();
             }
         }
     }
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index d70ff53198..f4e729da18 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -406,7 +406,7 @@ namespace MWScript
         const MWWorld::ESMStore &store = world->getStore();
         const ESM::Faction *faction = store.get<ESM::Faction>().find(factionId);
 
-        if(rank < 0 || rank > 9)
+        if(rank < 0)
             return "";
 
         return faction->mRanks[rank];
diff --git a/apps/openmw/mwstate/quicksavemanager.cpp b/apps/openmw/mwstate/quicksavemanager.cpp
index 4bae9e674a..e7d045283f 100644
--- a/apps/openmw/mwstate/quicksavemanager.cpp
+++ b/apps/openmw/mwstate/quicksavemanager.cpp
@@ -1,8 +1,8 @@
 #include "quicksavemanager.hpp"
 
 MWState::QuickSaveManager::QuickSaveManager(std::string &saveName, unsigned int maxSaves)
+  : mSaveName(saveName)
 {
-    this->mSaveName = saveName;
     this->mMaxSaves = maxSaves;
     this->mOldestSlotVisited = NULL;
     this->mSlotsVisited = 0;
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index f33c7bb67b..10a4e5fffa 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -685,8 +685,8 @@ namespace MWWorld
     {
         state.mId = mCell->getCellId();
 
-        if (mCell->mData.mFlags & ESM::Cell::Interior && mCell->mData.mFlags & ESM::Cell::HasWater)
-            state.mWaterLevel = mWaterLevel;
+        // if (mCell->mData.mFlags & ESM::Cell::Interior && mCell->mData.mFlags & ESM::Cell::HasWater)
+        //     state.mWaterLevel = mWaterLevel;
 
         state.mWaterLevel = mWaterLevel;
         state.mHasFogOfWar = (mFogState.get() ? 1 : 0);
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 4b844f464c..2c2d401d18 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -460,8 +460,7 @@ namespace MWWorld
             float z = pos.rot[2];
             world->rotateObject(player, x, y, z);
 
-            if (adjustPlayerPos)
-                player.getClass().adjustPosition(player, true);
+            player.getClass().adjustPosition(player, true);
         }
 
         MWBase::MechanicsManager *mechMgr =
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index c958572cac..155e4340a0 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -1134,7 +1134,6 @@ inline void WeatherManager::calculateTransitionResult(const float factor, const
         mResult.mIsStorm = current.mIsStorm;
         mResult.mParticleEffect = current.mParticleEffect;
         mResult.mRainEffect = current.mRainEffect;
-        mResult.mParticleEffect = current.mParticleEffect;
         mResult.mRainSpeed = current.mRainSpeed;
         mResult.mRainFrequency = current.mRainFrequency;
         mResult.mAmbientSoundVolume = 1-(factor*2);
@@ -1146,7 +1145,6 @@ inline void WeatherManager::calculateTransitionResult(const float factor, const
         mResult.mIsStorm = other.mIsStorm;
         mResult.mParticleEffect = other.mParticleEffect;
         mResult.mRainEffect = other.mRainEffect;
-        mResult.mParticleEffect = other.mParticleEffect;
         mResult.mRainSpeed = other.mRainSpeed;
         mResult.mRainFrequency = other.mRainFrequency;
         mResult.mAmbientSoundVolume = 2*(factor-0.5f);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 99eedf73da..13bfc32b38 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -406,7 +406,6 @@ namespace MWWorld
         gmst["sCompanionWarningMessage"] = ESM::Variant("Warning message");
         gmst["sCompanionWarningButtonOne"] = ESM::Variant("Button 1");
         gmst["sCompanionWarningButtonTwo"] = ESM::Variant("Button 2");
-        gmst["sCompanionShare"] = ESM::Variant("Companion Share");
         gmst["sProfitValue"] = ESM::Variant("Profit Value");
         gmst["sTeleportDisabled"] = ESM::Variant("Teleport disabled");
         gmst["sLevitateDisabled"] = ESM::Variant("Levitate disabled");
diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index 7a4dcbf10c..3deb30f25f 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -161,7 +161,7 @@ void Wizard::InstallationPage::showFileDialog(Wizard::Component component)
 
     if (path.isEmpty()) {
         logTextEdit->appendHtml(tr("<p><br/><span style=\"color:red;\"> \
-                                    <b>Error: The installation was aborted by the user</b></p>"));
+                                    <b>Error: The installation was aborted by the user</b></span></p>"));
 
         mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
         mWizard->mError = true;
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index 020de9f801..9cdb4cd786 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -472,8 +472,8 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
 
                 if (morrowindFound) {
                     // Check if we have correct archive, other archives have Morrowind.bsa too
-                    if ((tribunalFound && bloodmoonFound)
-                            || (!tribunalFound && !bloodmoonFound)) {
+                    if (tribunalFound == bloodmoonFound)
+                    {
                         cabFile = file;
                         found = true; // We have a GoTY disk or a Morrowind-only disk
                     }
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index e41201d6e6..f35149586e 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -173,10 +173,10 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
     }
 
     if (!inInventory)
+    {
         esm.writeHNOCString ("KNAM", mKey);
-
-    if (!inInventory)
         esm.writeHNOCString ("TNAM", mTrap);
+    }
 
     if (mReferenceBlocked != -1)
         esm.writeHNT("UNAM", mReferenceBlocked);
@@ -188,7 +188,7 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
 void ESM::CellRef::blank()
 {
     mRefNum.unset();
-    mRefID.clear();    
+    mRefID.clear();
     mScale = 1;
     mOwner.clear();
     mGlobalVariable.clear();
@@ -205,7 +205,7 @@ void ESM::CellRef::blank()
     mTrap.clear();
     mReferenceBlocked = -1;
     mTeleport = false;
-    
+
     for (int i=0; i<3; ++i)
     {
         mDoorDest.pos[i] = 0;
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index 6e0e6db9de..e708bbb4e5 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -109,8 +109,6 @@ namespace ESM
 
     void Region::blank()
     {
-        mName.clear();
-
         mData.mClear = mData.mCloudy = mData.mFoggy = mData.mOvercast = mData.mRain =
             mData.mThunder = mData.mAsh, mData.mBlight = mData.mA = mData.mB = 0;
 
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 63efb36be1..dc144d1197 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -232,9 +232,9 @@ namespace ESMTerrain
                 // Skip the first row / column unless we're at a chunk edge,
                 // since this row / column is already contained in a previous cell
                 // This is only relevant if we're creating a chunk spanning multiple cells
-                if (colStart == 0 && vertY_ != 0)
+                if (vertY_ != 0)
                     colStart += increment;
-                if (rowStart == 0 && vertX_ != 0)
+                if (vertX_ != 0)
                     rowStart += increment;
 
                 // Only relevant for chunks smaller than (contained in) one cell
diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp
index d2c97953c0..f19281104f 100644
--- a/components/fontloader/fontloader.cpp
+++ b/components/fontloader/fontloader.cpp
@@ -448,7 +448,7 @@ namespace Gui
             MyGUI::FontCodeType::Enum type;
             if(i == 0)
                 type = MyGUI::FontCodeType::Selected;
-            else if (i == 1)
+            else
                 type = MyGUI::FontCodeType::SelectedBack;
 
             MyGUI::xml::ElementPtr cursorCode = codes->createChild("Code");
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 6e04c6405b..0add92f29a 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -275,7 +275,6 @@ namespace NifOsg
                     for (unsigned int i=0; i<root->getNumChildren(); ++i)
                         skel->addChild(root->getChild(i));
                     root->removeChildren(0, root->getNumChildren());
-                    created = skel;
                 }
                 else
                     skel->addChild(created);