diff --git a/build/codeblocks/SFML.workspace b/build/codeblocks/SFML.workspace
index ba1c72691..deb7b6704 100644
--- a/build/codeblocks/SFML.workspace
+++ b/build/codeblocks/SFML.workspace
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="SFML workspace">
-		<Project filename="sfml-system.cbp" />
+		<Project filename="sfml-system.cbp" active="1" />
 		<Project filename="sfml-window.cbp" />
 		<Project filename="sfml-network.cbp" />
 		<Project filename="sfml-graphics.cbp" />
 		<Project filename="sfml-audio.cbp" />
-		<Project filename="sfml-main.cbp" active="1" />
+		<Project filename="sfml-main.cbp" />
 		<Project filename="..\..\samples\build\codeblocks\ftp.cbp" />
 		<Project filename="..\..\samples\build\codeblocks\opengl.cbp" />
 		<Project filename="..\..\samples\build\codeblocks\pong.cbp" />
diff --git a/build/codeblocks/sfml-system.cbp b/build/codeblocks/sfml-system.cbp
index cd28ba507..ae621ca7d 100644
--- a/build/codeblocks/sfml-system.cbp
+++ b/build/codeblocks/sfml-system.cbp
@@ -90,6 +90,7 @@
 			<Add directory="..\..\include" />
 		</Compiler>
 		<Unit filename="..\..\include\SFML\System\Clock.hpp" />
+		<Unit filename="..\..\include\SFML\System\Err.hpp" />
 		<Unit filename="..\..\include\SFML\System\Lock.hpp" />
 		<Unit filename="..\..\include\SFML\System\Mutex.hpp" />
 		<Unit filename="..\..\include\SFML\System\NonCopyable.hpp" />
@@ -110,6 +111,7 @@
 		<Unit filename="..\..\include\SFML\System\Vector3.hpp" />
 		<Unit filename="..\..\include\SFML\System\Vector3.inl" />
 		<Unit filename="..\..\src\SFML\System\Clock.cpp" />
+		<Unit filename="..\..\src\SFML\System\Err.cpp" />
 		<Unit filename="..\..\src\SFML\System\Lock.cpp" />
 		<Unit filename="..\..\src\SFML\System\Mutex.cpp" />
 		<Unit filename="..\..\src\SFML\System\Platform.hpp" />
diff --git a/build/vc2005/sfml-system.vcproj b/build/vc2005/sfml-system.vcproj
index dcfaef043..21e93979f 100644
--- a/build/vc2005/sfml-system.vcproj
+++ b/build/vc2005/sfml-system.vcproj
@@ -382,6 +382,14 @@
 			RelativePath="..\..\include\SFML\System\Clock.hpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\SFML\System\Err.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\include\SFML\System\Err.hpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\SFML\System\Lock.cpp"
 			>
diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp
index d651b6248..b16eee317 100644
--- a/src/SFML/Window/Win32/WindowImplWin32.cpp
+++ b/src/SFML/Window/Win32/WindowImplWin32.cpp
@@ -674,7 +674,7 @@ Key::Code WindowImplWin32::VirtualKeyCodeToSF(WPARAM key, LPARAM flags)
         case VK_SHIFT :
         {
             static UINT lShift = MapVirtualKey(VK_LSHIFT, MAPVK_VK_TO_VSC);
-            UINT scancode = (flags & (0xFF << 16)) >> 16;
+            UINT scancode = static_cast<UINT>((flags & (0xFF << 16)) >> 16);
             return scancode == lShift ? Key::LShift : Key::RShift;
         }