diff --git a/source/common/statusbar/base_sbar.cpp b/source/common/statusbar/base_sbar.cpp
index b0e917872..ae1a375c3 100644
--- a/source/common/statusbar/base_sbar.cpp
+++ b/source/common/statusbar/base_sbar.cpp
@@ -605,13 +605,13 @@ void DStatusBarCore::DrawGraphic(FGameTexture* tex, double x, double y, int flag
 //
 //============================================================================
 
-void DStatusBarCore::DrawRotated(FTextureID texture, double x, double y, double angle, int flags, double Alpha, double scaleX, double scaleY, PalEntry color, int translation, ERenderStyle style)
+void DStatusBarCore::DrawRotated(FTextureID texture, double x, double y, int flags, double angle, double Alpha, double scaleX, double scaleY, PalEntry color, int translation, ERenderStyle style)
 {
 	if (!texture.isValid())
 		return;
 
 	FGameTexture* tex = TexMan.GetGameTexture(texture, !(flags & DI_DONTANIMATE));
-	DrawRotated(tex, x, y, angle, flags, Alpha, scaleX, scaleY, color, translation, style);
+	DrawRotated(tex, x, y, flags, angle, Alpha, scaleX, scaleY, color, translation, style);
 }
 
 void DStatusBarCore::DrawRotated(FGameTexture* tex, double x, double y, int flags, double angle, double Alpha, double scaleX, double scaleY, PalEntry color, int translation, ERenderStyle style)
diff --git a/source/common/statusbar/base_sbar.h b/source/common/statusbar/base_sbar.h
index 02c66ba26..7f892b4e4 100644
--- a/source/common/statusbar/base_sbar.h
+++ b/source/common/statusbar/base_sbar.h
@@ -186,7 +186,7 @@ public:
 	void StatusbarToRealCoords(double& x, double& y, double& w, double& h) const;
 	void DrawGraphic(FGameTexture* texture, double x, double y, int flags, double Alpha, double boxwidth, double boxheight, double scaleX, double scaleY, PalEntry color = 0xffffffff, int translation = 0, ERenderStyle style = STYLE_Translucent, double clipwidth = -1.0);
 	void DrawGraphic(FTextureID texture, double x, double y, int flags, double Alpha, double boxwidth, double boxheight, double scaleX, double scaleY, PalEntry color = 0xffffffff, int translation = 0, ERenderStyle style = STYLE_Translucent, double clipwidth = -1.0);
-	void DrawRotated(FTextureID texture, double x, double y, double angle, int flags, double Alpha, double scaleX, double scaleY, PalEntry color = 0xffffffff, int translation = 0, ERenderStyle style = STYLE_Translucent);
+	void DrawRotated(FTextureID texture, double x, double y, int flags, double angle, double Alpha, double scaleX, double scaleY, PalEntry color = 0xffffffff, int translation = 0, ERenderStyle style = STYLE_Translucent);
 	void DrawRotated(FGameTexture* tex, double x, double y, int flags, double angle, double Alpha, double scaleX, double scaleY, PalEntry color = 0xffffffff, int translation = 0, ERenderStyle style = STYLE_Translucent);
 	void DrawString(FFont* font, const FString& cstring, double x, double y, int flags, double Alpha, int translation, int spacing, EMonospacing monospacing, int shadowX, int shadowY, double scaleX, double scaleY, int pt);
 	void TransformRect(double& x, double& y, double& w, double& h, int flags = 0);
diff --git a/source/common/textures/animtexture.cpp b/source/common/textures/animtexture.cpp
index 6a96365a8..8f8add3f7 100644
--- a/source/common/textures/animtexture.cpp
+++ b/source/common/textures/animtexture.cpp
@@ -48,7 +48,6 @@ void AnimTexture::SetFrameSize(int  format, int width, int height)
     FTexture::SetSize(width, height);
     Image.Resize(width * height * (format == Paletted ? 1 : 3));
     memset(Image.Data(), 0, Image.Size());
-    CleanHardwareTextures();
 }
 
 void AnimTexture::SetFrame(const uint8_t* palette, const void* data_)
@@ -81,7 +80,6 @@ void AnimTexture::SetFrame(const uint8_t* palette, const void* data_)
         }
         else memcpy(Image.Data(), data_, Width * Height * (pixelformat == Paletted ? 1 : 3));
     }
-    CleanHardwareTextures();
 }
 
 //===========================================================================
@@ -156,10 +154,13 @@ void AnimTextures::SetSize(int format, int width, int height)
     static_cast<AnimTexture*>(tex[1]->GetTexture())->SetFrameSize(format, width, height);
     tex[0]->SetSize(width, height);
     tex[1]->SetSize(width, height);
+    tex[0]->CleanHardwareData();
+    tex[1]->CleanHardwareData();
 }
 
 void AnimTextures::SetFrame(const uint8_t* palette, const void* data)
 {
     active ^= 1;
     static_cast<AnimTexture*>(tex[active]->GetTexture())->SetFrame(palette, data);
+    tex[active]->CleanHardwareData();
 }
diff --git a/source/core/textures/buildtiles.cpp b/source/core/textures/buildtiles.cpp
index 987736ea4..cbddedbdb 100644
--- a/source/core/textures/buildtiles.cpp
+++ b/source/core/textures/buildtiles.cpp
@@ -257,7 +257,7 @@ void BuildTiles::InvalidateTile(int num)
 	if ((unsigned) num < MAXTILES)
 	{
 		auto tex = tiledata[num].texture;
-		tex->GetTexture()->SystemTextures.Clean();
+		tex->CleanHardwareData();
 		tiledata[num].rawCache.data.Clear();
 	}
 }