diff --git a/client/CAnimation.cpp b/client/CAnimation.cpp
index a9a2b20c6..f0c455fe5 100644
--- a/client/CAnimation.cpp
+++ b/client/CAnimation.cpp
@@ -73,16 +73,6 @@ public:
  *  DefFile, class used for def loading                                  *
  *************************************************************************/
 
-size_t getPaletteSize(int type)
-{
-	switch (type)
-	{
-		case 66: return 32;
-		case 71: return 4;
-		default: return 20;
-	}
-}
-
 CDefFile::CDefFile(std::string Name):
 	data(NULL),
 	palette(NULL)
@@ -119,7 +109,10 @@ CDefFile::CDefFile(std::string Name):
 		palette[i].b = data[it++];
 		palette[i].unused = 255;
 	}
-	memcpy(palette, H3Palette, getPaletteSize(type));//initialize shadow\selection colors
+	if (type == 71)//Buttons/buildings don't have shadows\semi-transparency
+		memset(palette, 0, sizeof(SDL_Color)*8);
+	else
+		memcpy(palette, H3Palette, sizeof(SDL_Color)*8);//initialize shadow\selection colors
 
 	for (unsigned int i=0; i<totalBlocks; i++)
 	{
diff --git a/client/CBattleInterface.cpp b/client/CBattleInterface.cpp
index 4b8e833a6..45f3dcbdb 100644
--- a/client/CBattleInterface.cpp
+++ b/client/CBattleInterface.cpp
@@ -3584,7 +3584,8 @@ void CBattleInterface::showPieceOfWall(SDL_Surface * to, int hex, const std::vec
 void CBattleInterface::redrawBackgroundWithHexes(const CStack * activeStack)
 {
 	attackableHexes.clear();
-	occupyableHexes = curInt->cb->battleGetAvailableHexes(activeStack, true, &attackableHexes);
+	if (activeStack)
+		occupyableHexes = curInt->cb->battleGetAvailableHexes(activeStack, true, &attackableHexes);
 
 	//preparating background graphic with hexes and shaded hexes
 	blitAt(background, 0, 0, backgroundWithHexes);