diff --git a/extlibs/bin/x86_64/sndfile.framework/Resources b/extlibs/bin/x86_64/sndfile.framework/Resources
new file mode 120000
index 00000000..953ee36f
--- /dev/null
+++ b/extlibs/bin/x86_64/sndfile.framework/Resources
@@ -0,0 +1 @@
+Versions/Current/Resources
\ No newline at end of file
diff --git a/extlibs/bin/x86_64/sndfile.framework/Versions/A/Resources/Info.plist b/extlibs/bin/x86_64/sndfile.framework/Versions/A/Resources/Info.plist
new file mode 100644
index 00000000..4ae5f883
--- /dev/null
+++ b/extlibs/bin/x86_64/sndfile.framework/Versions/A/Resources/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>sndfile</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.mega-nerd.sndfile</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/extlibs/bin/x86_64/sndfile.framework/Versions/A/sndfile b/extlibs/bin/x86_64/sndfile.framework/Versions/A/sndfile
new file mode 100755
index 00000000..e4595106
Binary files /dev/null and b/extlibs/bin/x86_64/sndfile.framework/Versions/A/sndfile differ
diff --git a/extlibs/bin/x86_64/sndfile.framework/Versions/Current b/extlibs/bin/x86_64/sndfile.framework/Versions/Current
new file mode 120000
index 00000000..8c7e5a66
--- /dev/null
+++ b/extlibs/bin/x86_64/sndfile.framework/Versions/Current
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/extlibs/bin/x86_64/sndfile.framework/sndfile b/extlibs/bin/x86_64/sndfile.framework/sndfile
new file mode 120000
index 00000000..1e01cac9
--- /dev/null
+++ b/extlibs/bin/x86_64/sndfile.framework/sndfile
@@ -0,0 +1 @@
+Versions/Current/sndfile
\ No newline at end of file
diff --git a/src/SFML/System/Unix/Platform.cpp b/src/SFML/System/Unix/Platform.cpp
index 8446c1bb..a7546976 100644
--- a/src/SFML/System/Unix/Platform.cpp
+++ b/src/SFML/System/Unix/Platform.cpp
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 
+
 namespace sf
 {
 namespace priv
diff --git a/src/SFML/System/Win32/Platform.cpp b/src/SFML/System/Win32/Platform.cpp
index 7ad0fb6a..a3b0e768 100644
--- a/src/SFML/System/Win32/Platform.cpp
+++ b/src/SFML/System/Win32/Platform.cpp
@@ -36,29 +36,29 @@ namespace priv
 ////////////////////////////////////////////////////////////
 double Platform::GetSystemTime()
 {
-    static LARGE_INTEGER Frequency;
-    static BOOL          UseHighPerformanceTimer = QueryPerformanceFrequency(&Frequency);
+    static LARGE_INTEGER frequency;
+    static BOOL          useHighPerformanceTimer = QueryPerformanceFrequency(&frequency);
 
-    if (UseHighPerformanceTimer)
+    if (useHighPerformanceTimer)
     {
         // High performance counter available : use it
-        LARGE_INTEGER CurrentTime;
-        QueryPerformanceCounter(&CurrentTime);
+        LARGE_INTEGER currentTime;
+        QueryPerformanceCounter(&currentTime);
 
-        return static_cast<double>(CurrentTime.QuadPart) / Frequency.QuadPart;
+        return static_cast<double>(currentTime.QuadPart) / frequency.QuadPart;
     }
     else
     {
-        // High performance counter not available : use GetTickCount (less accurate)
+        // High performance counter not available: use GetTickCount (less accurate)
         return GetTickCount() * 0.001;
     }
 }
 
 
 ////////////////////////////////////////////////////////////
-void Platform::Sleep(float Time)
+void Platform::Sleep(float time)
 {
-    ::Sleep(static_cast<DWORD>(Time * 1000));
+    ::Sleep(static_cast<DWORD>(time * 1000));
 }
 
 } // namespace priv
diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp
index 180e9010..0f3e2ac8 100644
--- a/src/SFML/Window/Win32/WindowImplWin32.cpp
+++ b/src/SFML/Window/Win32/WindowImplWin32.cpp
@@ -100,10 +100,12 @@ myIsCursorIn      (false)
         RegisterWindowClass();
 
     // Compute position and size
-    int left   = (GetDeviceCaps(GetDC(NULL), HORZRES) - mode.Width)  / 2;
-    int top    = (GetDeviceCaps(GetDC(NULL), VERTRES) - mode.Height) / 2;
+    HDC screenDC = GetDC(NULL);
+    int left   = (GetDeviceCaps(screenDC, HORZRES) - mode.Width)  / 2;
+    int top    = (GetDeviceCaps(screenDC, VERTRES) - mode.Height) / 2;
     int width  = myWidth  = mode.Width;
     int height = myHeight = mode.Height;
+    ReleaseDC(NULL, screenDC);
 
     // Choose the window style according to the Style parameter
     DWORD win32Style = WS_VISIBLE;