diff --git a/code/LWOAnimation.cpp b/code/LWOAnimation.cpp
index f25a92e8c..a14e3b466 100644
--- a/code/LWOAnimation.cpp
+++ b/code/LWOAnimation.cpp
@@ -315,8 +315,8 @@ void AnimResolver::DoInterpolation2(std::vector<LWO::Key>::const_iterator beg,
 
 // ------------------------------------------------------------------------------------------------
 // Subsample animation track by given key values
-void AnimResolver::SubsampleAnimTrack(std::vector<aiVectorKey>& out,
-	double time,double sample_delta)
+void AnimResolver::SubsampleAnimTrack(std::vector<aiVectorKey>& /*out*/,
+	double /*time*/ ,double /*sample_delta*/ )
 {
 	ai_assert(out.empty() && sample_delta);
 
diff --git a/code/LWOBLoader.cpp b/code/LWOBLoader.cpp
index 63316ee3d..ff8d0909e 100644
--- a/code/LWOBLoader.cpp
+++ b/code/LWOBLoader.cpp
@@ -54,7 +54,8 @@ using namespace Assimp;
 void LWOImporter::LoadLWOBFile()
 {
 	LE_NCONST uint8_t* const end = mFileBuffer + fileSize;
-	while (true)
+	bool running = true;
+	while (running)
 	{
 		if (mFileBuffer + sizeof(IFF::ChunkHeader) > end)break;
 		LE_NCONST IFF::ChunkHeader* const head = IFF::LoadChunk(mFileBuffer);
@@ -229,7 +230,8 @@ void LWOImporter::LoadLWOBSurface(unsigned int size)
 	LWO::Texture* pTex = NULL;
 
 	GetS0(surf.mName,size);
-	while (true)	{
+	bool runnning = true;
+	while (runnning)	{
 		if (mFileBuffer + 6 >= end)
 			break;
 
@@ -244,7 +246,7 @@ void LWOImporter::LoadLWOBSurface(unsigned int size)
 		 */
 		if (mFileBuffer + head->length > end) {
 			DefaultLogger::get()->error("LWOB: Invalid surface chunk length. Trying to continue.");
-			head->length = end - mFileBuffer;
+			head->length = (uint16_t) (end - mFileBuffer);
 		}
 
 		uint8_t* const next = mFileBuffer+head->length;