diff --git a/nsis/installer.nsi b/nsis/installer.nsi
index f4a180bf9..1e93b2255 100644
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -11,8 +11,8 @@
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 9
 !define VERSIONBUILD 0
-!define ARGS "--warp"
-!define FIRST_START_ARGS "ui --warp --mode=passive"
+!define ARGS ""
+!define FIRST_START_ARGS "--mode=passive ui"
 
 !addplugindir .\
 
diff --git a/nsis/logo.ico b/nsis/logo.ico
index 61e68b90b..337475b70 100644
Binary files a/nsis/logo.ico and b/nsis/logo.ico differ
diff --git a/parity/rpc.rs b/parity/rpc.rs
index 995c7f988..0bc1c14e2 100644
--- a/parity/rpc.rs
+++ b/parity/rpc.rs
@@ -304,9 +304,13 @@ pub fn new_ipc<D: rpc_apis::Dependencies>(
 	let handler = setup_apis(conf.apis, dependencies);
 	let remote = dependencies.remote.clone();
 	let path = PathBuf::from(&conf.socket_addr);
-	if let Some(dir) = path.parent() {
-		::std::fs::create_dir_all(&dir)
-			.map_err(|err| format!("Unable to create IPC directory at {}: {}", dir.display(), err))?;
+	// Make sure socket file can be created on unix-like OS.
+	// Windows pipe paths are not on the FS.
+	if !cfg!(windows) {
+		if let Some(dir) = path.parent() {
+			::std::fs::create_dir_all(&dir)
+				.map_err(|err| format!("Unable to create IPC directory at {}: {}", dir.display(), err))?;
+		}
 	}
 
 	match rpc::start_ipc(&conf.socket_addr, handler, remote, rpc::RpcExtractor) {
diff --git a/windows/ptray/ptray.cpp b/windows/ptray/ptray.cpp
index 30f41b35a..8fc29880e 100644
--- a/windows/ptray/ptray.cpp
+++ b/windows/ptray/ptray.cpp
@@ -315,8 +315,9 @@ void OpenUI()
 	STARTUPINFO startupInfo = { sizeof(STARTUPINFO) };
 
 	LPWSTR args = new WCHAR[lstrlen(commandLineFiltered) + MAX_PATH + 2];
-	lstrcpy(args, L"parity.exe ui ");
+	lstrcpy(args, L"parity.exe ");
 	lstrcat(args, commandLineFiltered);
+	lstrcat(args, L" ui");
 	CreateProcess(path, args, nullptr, nullptr, false, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &procInfo);
 }