diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5805d190..143743dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,7 @@ IF ( ${CMAKE_SYSTEM} MATCHES "Linux" )
 	SET ( DEFAULT_CEC         ON )
 ELSEIF ( WIN32 )
 	SET ( DEFAULT_DX OFF )
+	SET ( DEFAULT_MF ON )
 ELSE()
 	SET ( DEFAULT_V4L2        OFF )
 	SET ( DEFAULT_FB          OFF )
diff --git a/assets/webconfig/js/content_grabber.js b/assets/webconfig/js/content_grabber.js
index 96efbde1..8f12dd11 100755
--- a/assets/webconfig/js/content_grabber.js
+++ b/assets/webconfig/js/content_grabber.js
@@ -55,7 +55,7 @@ $(document).ready(function () {
       if (schema[key]) {
         var enumVals = [];
         var enumTitelVals = [];
-        var v4l2_properties = JSON.parse(JSON.stringify(window.serverInfo.grabbers.v4l2_properties));
+        var v4l2_properties = JSON.parse(JSON.stringify(window.serverInfo.grabbers.video_sources));
 
         if (key == 'available_devices') {
           for (var i = 0; i < v4l2_properties.length; i++) {
@@ -66,6 +66,7 @@ $(document).ready(function () {
               : enumTitelVals.push(v4l2_properties[i]['device']);
           }
         } else if (key == 'device_inputs') {
+          return; // TODO Fix V4L2 WebUI
           for (var i = 0; i < v4l2_properties.length; i++) {
             if (v4l2_properties[i]['device'] == device) {
               for (var index = 0; index < v4l2_properties[i]['device_inputs'].length; index++) {
diff --git a/libsrc/grabber/mediafoundation/MFGrabber.cpp b/libsrc/grabber/mediafoundation/MFGrabber.cpp
index 11037b79..40ce2c2f 100644
--- a/libsrc/grabber/mediafoundation/MFGrabber.cpp
+++ b/libsrc/grabber/mediafoundation/MFGrabber.cpp
@@ -191,7 +191,7 @@ HRESULT MFGrabber::init_device(QString deviceName, DeviceProperties props)
 		goto done;
 	}
 
-	if(FAILED(deviceAttributes->SetString(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, (LPCWSTR)props.symlink.toStdString().c_str())) && _sourceReaderCB)
+	if(FAILED(deviceAttributes->SetString(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, (LPCWSTR)props.symlink.utf16())) && _sourceReaderCB)
 	{
 		error = QString("IMFAttributes_SetString_MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK (%1)").arg(hr);
 		goto done;