diff --git a/YY-Thunks.cmake b/YY-Thunks.cmake
index 92532d7..4c30988 100644
--- a/YY-Thunks.cmake
+++ b/YY-Thunks.cmake
@@ -33,15 +33,20 @@ if(NOT DEFINED YYTHUNKS_TARGET_OS)
     set(YYTHUNKS_TARGET_OS "Vista" CACHE STRING "Supported values: Vista, WinXP" FORCE)
 endif()
 
-set(__yy_thunks_dir)
-if(DEFINED ENV{YYTHUNKS_INSTALL_DIR} AND EXISTS "$ENV{YYTHUNKS_INSTALL_DIR}")
-    set(__yy_thunks_dir "$ENV{YYTHUNKS_INSTALL_DIR}")
-else()
-    set(__yy_thunks_reg)
+set(__yy_thunks_dir "")
+if(DEFINED ENV{YYTHUNKS_INSTALL_DIR})
+    set(__env "$ENV{YYTHUNKS_INSTALL_DIR}")
+    if(NOT "x${__env}" STREQUAL "x" AND EXISTS "${__env}")
+        set(__yy_thunks_dir "${__env}")
+    endif()
+endif()
+
+if("x${__yy_thunks_dir}" STREQUAL "x")
+    set(__yy_thunks_reg "")
     cmake_host_system_information(RESULT __yy_thunks_reg
         QUERY WINDOWS_REGISTRY "HKCU/Code/YY-Thunks"
         VALUE "Root")
-    if(__yy_thunks_reg AND EXISTS "${__yy_thunks_reg}")
+    if(NOT "x${__yy_thunks_reg}" STREQUAL "x" AND EXISTS "${__yy_thunks_reg}")
         set(__yy_thunks_dir "${__yy_thunks_reg}")
     elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/YY-Thunks")
         set(__yy_thunks_dir "${CMAKE_CURRENT_LIST_DIR}/YY-Thunks")
@@ -56,7 +61,11 @@ else()
     endif()
 endif()
 
-if(__yy_thunks_dir AND EXISTS "${__yy_thunks_dir}")
+if(NOT "x${__yy_thunks_dir}" STREQUAL "x")
+    cmake_path(NORMAL_PATH __yy_thunks_dir OUTPUT_VARIABLE __yy_thunks_dir)
+endif()
+
+if(NOT "x${__yy_thunks_dir}" STREQUAL "x" AND EXISTS "${__yy_thunks_dir}")
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(__yy_thunks_arch x64)
     else()
@@ -66,6 +75,8 @@ if(__yy_thunks_dir AND EXISTS "${__yy_thunks_dir}")
     if(EXISTS "${__yy_thunks_obj}")
         set(YYTHUNKS_FOUND TRUE CACHE BOOL "" FORCE)
         set(YYTHUNKS_INSTALL_DIR "${__yy_thunks_dir}" CACHE STRING "" FORCE)
+        set(YYTHUNKS_ARCH "${__yy_thunks_arch}" CACHE STRING "" FORCE)
+        set(YYTHUNKS_OBJ_FILE "YY_Thunks_for_${YYTHUNKS_TARGET_OS}.obj" CACHE STRING "" FORCE)
         set(YYTHUNKS_OBJ_PATH "${__yy_thunks_obj}" CACHE STRING "" FORCE)
         add_link_options("${__yy_thunks_obj}")
         message("###################################################################################################")