diff --git a/projects/mtg/src/CardPrimitive.cpp b/projects/mtg/src/CardPrimitive.cpp
index 8fd22dfe7..9612024ca 100644
--- a/projects/mtg/src/CardPrimitive.cpp
+++ b/projects/mtg/src/CardPrimitive.cpp
@@ -52,7 +52,7 @@ int CardPrimitive::init()
     magicTexts.clear();
     spellTargetType = "";
     alias = 0;
-    bool hasRestriction = false;
+    hasRestriction = false;
     return 1;
 }
 
diff --git a/projects/mtg/src/GuiHand.cpp b/projects/mtg/src/GuiHand.cpp
index da77baae8..60748d2ee 100644
--- a/projects/mtg/src/GuiHand.cpp
+++ b/projects/mtg/src/GuiHand.cpp
@@ -44,11 +44,8 @@ GuiHand::GuiHand(MTGHand* hand) :
 
 GuiHand::~GuiHand()
 {
-    if(cards.size())
-    {
         for (vector<CardView*>::iterator it = cards.begin(); it != cards.end(); ++it)
             delete (*it);
-    }
 }
 
 void GuiHand::Update(float dt)
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 946d8e61d..5bcdc1c0d 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -2798,7 +2798,7 @@ int AbilityFactory::computeX(Spell * spell, MTGCardInstance * card)
 {
     if (spell)
         return spell->computeX(card);
-        if(card) return card->X;
+    if(card) return card->X;
     return 0;
 }
 
@@ -2807,7 +2807,8 @@ int AbilityFactory::computeXX(Spell * spell, MTGCardInstance * card)
 {
     if (spell)
         return spell->computeXX(card);
-                if(card) return card->XX;
+    if(card)
+        return card->XX;
     return 0;
 }
 
diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp
index 223466dc8..b2946ef37 100644
--- a/projects/mtg/src/MTGRules.cpp
+++ b/projects/mtg/src/MTGRules.cpp
@@ -46,7 +46,7 @@ if(!allowedToCast(card,player))
             return 1;
         }
     }
-    else if ((card->hasType("instant")) || card->basicAbilities[Constants::FLASH]
+    else if ((card->hasType("instant")) || card->has(Constants::FLASH)
         || (player == currentPlayer && !game->isInterrupting
         && (game->currentGamePhase == Constants::MTG_PHASE_FIRSTMAIN
         || game->currentGamePhase == Constants::MTG_PHASE_SECONDMAIN))
diff --git a/projects/mtg/src/WEvent.cpp b/projects/mtg/src/WEvent.cpp
index baeaebae7..cd2e498e9 100644
--- a/projects/mtg/src/WEvent.cpp
+++ b/projects/mtg/src/WEvent.cpp
@@ -161,11 +161,8 @@ int WEventDamage::getValue()
 
 Targetable * WEventLife::getTarget(int target)
 {
-    switch (target)
+    if (target)
     {
-    case TARGET_TO:
-        return player;
-    case TARGET_FROM:
         return player;
     }
     return NULL;