diff --git a/src/Nazara/Network/IpAddress.cpp b/src/Nazara/Network/IpAddress.cpp
index b4cf72418..5bb4d68bf 100644
--- a/src/Nazara/Network/IpAddress.cpp
+++ b/src/Nazara/Network/IpAddress.cpp
@@ -162,10 +162,10 @@ namespace Nz
 					if (f0 == 0 && l0 == 5 && m_ipv6[5] == 0xFFFF)
 					{
 						IPv4 ipv4 = {
-							m_ipv6[6] >> 8,
-							m_ipv6[6] & 0xFF,
-							m_ipv6[7] >> 8,
-							m_ipv6[7] & 0xFF,
+							SafeCast<UInt8>(m_ipv6[6] >> 8),
+							SafeCast<UInt8>(m_ipv6[6] & 0xFF),
+							SafeCast<UInt8>(m_ipv6[7] >> 8),
+							SafeCast<UInt8>(m_ipv6[7] & 0xFF),
 						};
 
 						stream << "::ffff:";
diff --git a/src/Nazara/Shader/ShaderLangParser.cpp b/src/Nazara/Shader/ShaderLangParser.cpp
index c940145d9..232943410 100644
--- a/src/Nazara/Shader/ShaderLangParser.cpp
+++ b/src/Nazara/Shader/ShaderLangParser.cpp
@@ -665,6 +665,7 @@ namespace Nz::ShaderLang
 
 				case TokenType::For:
 					statement = ParseForDeclaration(std::move(attributes));
+					attributes.clear();
 					break;
 
 				case TokenType::Let:
@@ -703,6 +704,7 @@ namespace Nz::ShaderLang
 
 				case TokenType::While:
 					statement = ParseWhileStatement(std::move(attributes));
+					attributes.clear();
 					break;
 
 				default: