Added a bit of Windows 8 support