diff --git a/CMakeLists.txt b/CMakeLists.txt
index f70e465ff..67e326a0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,7 +180,7 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/free
 
 # Include directories
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # WinPR
 set(WINPR_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/winpr/include")
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 745aaaf67..ae8acdede 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -30,3 +30,5 @@ install(DIRECTORY freerdp/plugins DESTINATION include/freerdp FILES_MATCHING PAT
 install(DIRECTORY freerdp/rail DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY freerdp/server DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY freerdp/utils DESTINATION include/freerdp FILES_MATCHING PATTERN "*.h")
+
+
diff --git a/libfreerdp/utils/args.c b/libfreerdp/utils/args.c
index 0e370b214..481b45eaf 100644
--- a/libfreerdp/utils/args.c
+++ b/libfreerdp/utils/args.c
@@ -31,6 +31,7 @@
 #include <freerdp/utils/print.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/args.h>
+#include <freerdp/utils/passphrase.h>
 
 void freerdp_parse_hostname(rdpSettings* settings, char* hostname)
 {
@@ -865,10 +866,8 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
 		}
 		/* password */
 		if (NULL == settings->password) {
-			char input[512];
-			printf("password: ");
-			scanf("%511s", input);
-			settings->password = xstrdup(input);
+			settings->password = xmalloc(512 * sizeof(char));
+			freerdp_passphrase_read("password: ", settings->password, 512, settings->from_stdin);
 		}
 		/* domain */
 		if (NULL == settings->domain) {
diff --git a/libfreerdp/utils/wait_obj.c b/libfreerdp/utils/wait_obj.c
index e003b3ca7..ac4f1c021 100644
--- a/libfreerdp/utils/wait_obj.c
+++ b/libfreerdp/utils/wait_obj.c
@@ -219,6 +219,7 @@ wait_obj_select(struct wait_obj** listobj, int numobj, int timeout)
 		status = -1;
 	else
 		status = 0;
+	xfree(hnds);
 #endif
 
 	return status;