diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6870001d..93813577 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,7 +140,7 @@ if (${APPLE})
     add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
 endif (${APPLE})
 if (${WIN32})
-	list(APPEND LIBS ws2_32 Iphlpapi Psapi)
+	list(APPEND LIBS ws2_32 iphlpapi psapi)
 	#execute_process(COMMAND "make_rc_win.bat" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET)
 	#list(APPEND CPPS "pip_resource_win.o")
 	list(APPEND CPPS "pip_resource_win.rc")
diff --git a/src/io/piserial.cpp b/src/io/piserial.cpp
index 5e2d88fd..a1d912fe 100755
--- a/src/io/piserial.cpp
+++ b/src/io/piserial.cpp
@@ -715,8 +715,8 @@ PIStringList PISerial::availableDevices(bool test) {
 	PIVector<PIFile::FileInfo> de = dir.entries();
 	piForeachC (PIFile::FileInfo & e, de) { // TODO changes in FileInfo
 		piForeachC (PIString & p, prefixes) {
-			if (e.path.left(p.size_s()) != p) continue;
-			dl << "/dev/" + e.path;
+			if (e.name().left(p.size_s()) != p) continue;
+			dl << e.path;
 		}
 	}
 #  endif
diff --git a/src/system/pisystemmonitor.cpp b/src/system/pisystemmonitor.cpp
index 386d0bba..2c08e4e9 100755
--- a/src/system/pisystemmonitor.cpp
+++ b/src/system/pisystemmonitor.cpp
@@ -20,7 +20,7 @@
 #include "pisystemmonitor.h"
 #include "pisysteminfo.h"
 #ifdef WINDOWS
-#  include "TlHelp32.h"
+#  include "tlhelp32.h"
 #endif