diff --git a/CMakeLists.txt b/CMakeLists.txt
index d50194d0d..bde277ee8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ else ()
 endif ()
 
 cmake_minimum_required(VERSION 2.6)
-
+cmake_policy(SET CMP0020 OLD)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
@@ -113,8 +113,10 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT APPLE AND NOT WIN32)
 endif ()
 
 if (ENABLE_TAGLIB)
-    set(TAGLIB_MIN_VERSION "1.6")
-    find_package(Taglib)
+    if (TAGLIB_FOUND)
+        set(TAGLIB_MIN_VERSION "1.6")
+        find_package(Taglib)
+    endif()
     macro_log_feature(TAGLIB_FOUND "TagLib" "Tag editor, file organiser, etc." "http://taglib.github.io/")
 endif ()
 
@@ -212,6 +214,7 @@ find_package(Qt5Svg REQUIRED)
 find_package(Qt5Sql REQUIRED)
 
 if (${Qt5Widgets_VERSION} VERSION_GREATER "5.6.99")
+    set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
     set(CMAKE_CXX_STANDARD "11")
 endif ()
 
diff --git a/windows/cantata.nsi.cmake b/windows/cantata.nsi.cmake
index 3c3ef63b1..3c9e7628a 100644
--- a/windows/cantata.nsi.cmake
+++ b/windows/cantata.nsi.cmake
@@ -183,6 +183,8 @@ section "install"
     file "translations\cantata_es.qm"
     file "translations\cantata_fr.qm"
     file "translations\cantata_hu.qm"
+    file "translations\cantata_it.qm"
+    file "translations\cantata_ja.qm"
     file "translations\cantata_ko.qm"
     file "translations\cantata_pl.qm"
     file "translations\cantata_ru.qm"
@@ -595,6 +597,8 @@ section "uninstall"
     delete "$INSTDIR\translations\cantata_es.qm"
     delete "$INSTDIR\translations\cantata_fr.qm"
     delete "$INSTDIR\translations\cantata_hu.qm"
+    delete "$INSTDIR\translations\cantata_it.qm"
+    delete "$INSTDIR\translations\cantata_ja.qm"
     delete "$INSTDIR\translations\cantata_ko.qm"
     delete "$INSTDIR\translations\cantata_pl.qm"
     delete "$INSTDIR\translations\cantata_ru.qm"