diff --git a/manifest b/manifest
index 0e9e079..e33109f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixed\srepository\sactive\stags\sparsing\n
-D 2015-08-17T08:36:30.844
+C Fixed\scustom\saction\sexe\spath\sparsing\nRenamed\scustom\saction\smacros\sfrom\s'$'\sto\s'%'\sso\sthat\sthey\smatch\sfossil's\nFixed\sRelease\sbuild\swarnings
+D 2015-08-21T09:42:44.850
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -231,7 +231,7 @@ F src/FslSettingsDialog.cpp e00907d493fba469e48a008aecda88426350b5ac
 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp fd738336d66824cda5e9a466c40e4ac14a773d02
+F src/MainWindow.cpp 47ca7c79bfed2715b8b56caa44785520983630cf
 F src/MainWindow.h f4cffbe4d360d30aa2eeaa25fc6d50d0a39c617f
 F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac
 F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
@@ -243,7 +243,7 @@ F src/Settings.cpp 258d3f466f6a125ce2b8519d6d57a312cbc44a3f
 F src/Settings.h 0a10b0b83fe804bdc7dac58eed06b5b6ee422055
 F src/SettingsDialog.cpp 042bd3dbe715b0497541b6853a32c4d1f9ac1da9
 F src/SettingsDialog.h 5eb3ae2cbb00ab5544e1889860f5376f69fe47cd
-F src/Utils.cpp 84dab142439845a15dc6a6e8586dc5470ebdd59b
+F src/Utils.cpp abde90735cc999f8ce71c98aa3d9eaf642e9e7f2
 F src/Utils.h c6341ee49a8fc35f215facb196d70bf9b1f2fc0f
 F src/Workspace.cpp feab8b238a99cf1a60731aedf07af96010d9795d
 F src/Workspace.h 54eef32658b13a34fe78ae26887420e8ff358eaa
@@ -260,7 +260,7 @@ F ui/MainWindow.ui f9774e6dddb9462d8072bffd6c511bee7f470b9d
 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d
-P 2193c91c253a1de2657a19df0aa9a8b6604c7006
-R 903c9dc343a076b5eb8187b3aaf1e4b6
+P 581579c7dac57d016b878c707814491bb0cbe4f6
+R 89593f070d606ddbee38135aa3e67fb4
 U Kostas
-Z 130e0f7c035ae708bf2ddc9aae617e27
+Z f315639935201c2888db477bce7423cd
diff --git a/manifest.uuid b/manifest.uuid
index bd1d932..7260e1b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-581579c7dac57d016b878c707814491bb0cbe4f6
\ No newline at end of file
+b9521f3974653bd28a4f422c2f48755a949b9823
\ No newline at end of file
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 3ee82be..f3a799c 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1742,6 +1742,7 @@ void MainWindow::loadFossilSettings()
 		Settings::Setting::SettingType type = it->Type;
 
 		Q_ASSERT(type == Settings::Setting::TYPE_FOSSIL_GLOBAL || type == Settings::Setting::TYPE_FOSSIL_LOCAL);
+		Q_UNUSED(type);
 
 		// Otherwise it must be a fossil setting
 		if(!kv.contains(name))
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 5cd595d..fbd9dc2 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -535,10 +535,10 @@ void SplitCommandLine(const QString &commandLine, QString &command, QString &ext
 	}
 
 	int cmd_end = command.indexOf(cmd_char_end, start);
-	if(cmd_end != -1)
+	if(cmd_end > 0)
 	{
 		extraParams = command.mid(cmd_end+1);
-		command = command.left(cmd_end);
+		command = command.mid(start, cmd_end-1);
 	}
 
 	command = command.trimmed();
@@ -548,6 +548,10 @@ void SplitCommandLine(const QString &commandLine, QString &command, QString &ext
 //------------------------------------------------------------------------------
 bool SpawnExternalProcess(QObject *processParent, const QString& command, const QStringList& fileList, const stringset_t& pathSet, const QString &workspaceDir, UICallback &uiCallback)
 {
+	static const char* MACRO_FILE = "%FILE";
+	static const char* MACRO_FOLDER = "%FOLDER";
+	static const char* MACRO_WORKSPACE = "%WORKSPACE";
+
 	QStringList params;
 
 	QString cmd, extra_params;
@@ -563,21 +567,21 @@ bool SpawnExternalProcess(QObject *processParent, const QString& command, const
 
 		foreach(const QString &p, extra_param_list)
 		{
-			if(p.indexOf("$FILE")!=-1)
+			if(p.indexOf(MACRO_FILE)!=-1)
 			{
 				macro_file = p;
 				continue;
 			}
-			else if(p.indexOf("$FOLDER")!=-1)
+			else if(p.indexOf(MACRO_FOLDER)!=-1)
 			{
 				macro_folder = p;
 				continue;
 			}
-			else if(p.indexOf("$WORKSPACE")!=-1)
+			else if(p.indexOf(MACRO_WORKSPACE)!=-1)
 			{
 				// Add in-place
 				QString n = p;
-				n.replace("$WORKSPACE", workspaceDir, Qt::CaseInsensitive);
+				n.replace(MACRO_WORKSPACE, workspaceDir, Qt::CaseInsensitive);
 				params.push_back(n);
 				continue;
 			}
@@ -595,7 +599,7 @@ bool SpawnExternalProcess(QObject *processParent, const QString& command, const
 		if(!macro_file.isEmpty())
 		{
 			QString macro = macro_file;
-			path = macro.replace("$FILE", path, Qt::CaseInsensitive);
+			path = macro.replace(MACRO_FILE, path, Qt::CaseInsensitive);
 		}
 
 		params.append(path);
@@ -611,7 +615,7 @@ bool SpawnExternalProcess(QObject *processParent, const QString& command, const
 		if(!macro_folder.isEmpty())
 		{
 			QString macro = macro_folder;
-			path = macro.replace("$FOLDER", path, Qt::CaseInsensitive);
+			path = macro.replace(MACRO_FOLDER, path, Qt::CaseInsensitive);
 		}
 		params.append(path);
 	}