diff --git a/Util/src/AbstractConfiguration.cpp b/Util/src/AbstractConfiguration.cpp
index df5a1f408..d3373a1f9 100644
--- a/Util/src/AbstractConfiguration.cpp
+++ b/Util/src/AbstractConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // AbstractConfiguration.cpp
 //
-// $Id: //poco/svn/Util/src/AbstractConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/AbstractConfiguration.cpp#7 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/ConfigurationMapper.cpp b/Util/src/ConfigurationMapper.cpp
index 5bbcffde5..2a337052b 100644
--- a/Util/src/ConfigurationMapper.cpp
+++ b/Util/src/ConfigurationMapper.cpp
@@ -1,7 +1,7 @@
 //
 // ConfigurationMapper.cpp
 //
-// $Id: //poco/svn/Util/src/ConfigurationMapper.cpp#1 $
+// $Id: //poco/Main/Util/src/ConfigurationMapper.cpp#6 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/ConfigurationView.cpp b/Util/src/ConfigurationView.cpp
index 323ae856d..ba1dfde59 100644
--- a/Util/src/ConfigurationView.cpp
+++ b/Util/src/ConfigurationView.cpp
@@ -1,7 +1,7 @@
 //
 // ConfigurationView.cpp
 //
-// $Id: //poco/svn/Util/src/ConfigurationView.cpp#1 $
+// $Id: //poco/Main/Util/src/ConfigurationView.cpp#7 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/FilesystemConfiguration.cpp b/Util/src/FilesystemConfiguration.cpp
index 1863d4a9a..f1af7a690 100644
--- a/Util/src/FilesystemConfiguration.cpp
+++ b/Util/src/FilesystemConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // FilesystemConfiguration.cpp
 //
-// $Id: //poco/svn/Util/src/FilesystemConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/FilesystemConfiguration.cpp#8 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/HelpFormatter.cpp b/Util/src/HelpFormatter.cpp
index 782abf8ed..757a3290a 100644
--- a/Util/src/HelpFormatter.cpp
+++ b/Util/src/HelpFormatter.cpp
@@ -1,7 +1,7 @@
 //
 // HelpFormatter.cpp
 //
-// $Id: //poco/svn/Util/src/HelpFormatter.cpp#1 $
+// $Id: //poco/Main/Util/src/HelpFormatter.cpp#8 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/IniFileConfiguration.cpp b/Util/src/IniFileConfiguration.cpp
index f8789025b..9c778fcae 100644
--- a/Util/src/IniFileConfiguration.cpp
+++ b/Util/src/IniFileConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // IniFileConfiguration.cpp
 //
-// $Id: //poco/svn/Util/src/IniFileConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/IniFileConfiguration.cpp#9 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/IntValidator.cpp b/Util/src/IntValidator.cpp
index 24e7819b1..48f512fd9 100644
--- a/Util/src/IntValidator.cpp
+++ b/Util/src/IntValidator.cpp
@@ -1,7 +1,7 @@
 //
 // IntValidator.cpp
 //
-// $Id: //poco/svn/Util/src/IntValidator.cpp#1 $
+// $Id: //poco/Main/Util/src/IntValidator.cpp#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/LayeredConfiguration.cpp b/Util/src/LayeredConfiguration.cpp
index 0db9bf3ea..460aa01bd 100644
--- a/Util/src/LayeredConfiguration.cpp
+++ b/Util/src/LayeredConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // LayeredConfiguration.cpp
 //
-// $Id: //poco/svn/Util/src/LayeredConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/LayeredConfiguration.cpp#8 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/LoggingConfigurator.cpp b/Util/src/LoggingConfigurator.cpp
index 9f3754431..714b1b2c3 100644
--- a/Util/src/LoggingConfigurator.cpp
+++ b/Util/src/LoggingConfigurator.cpp
@@ -1,7 +1,7 @@
 //
 // LoggingConfigurator.cpp
 //
-// $Id: //poco/svn/Util/src/LoggingConfigurator.cpp#1 $
+// $Id: //poco/Main/Util/src/LoggingConfigurator.cpp#12 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/LoggingSubsystem.cpp b/Util/src/LoggingSubsystem.cpp
index d4e829146..9d4985339 100644
--- a/Util/src/LoggingSubsystem.cpp
+++ b/Util/src/LoggingSubsystem.cpp
@@ -1,7 +1,7 @@
 //
 // LoggingSubsystem.cpp
 //
-// $Id: //poco/svn/Util/src/LoggingSubsystem.cpp#1 $
+// $Id: //poco/Main/Util/src/LoggingSubsystem.cpp#8 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/src/MapConfiguration.cpp b/Util/src/MapConfiguration.cpp
index 157b520ee..53056aa6b 100644
--- a/Util/src/MapConfiguration.cpp
+++ b/Util/src/MapConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // MapConfiguration.cpp
 //
-// $Id: //poco/svn/Util/src/MapConfiguration.cpp#1 $
+// $Id: //poco/Main/Util/src/MapConfiguration.cpp#6 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/src/Option.cpp b/Util/src/Option.cpp
index 6d08a042b..12405e847 100644
--- a/Util/src/Option.cpp
+++ b/Util/src/Option.cpp
@@ -1,7 +1,7 @@
 //
 // Option.cpp
 //
-// $Id: //poco/svn/Util/src/Option.cpp#2 $
+// $Id: //poco/Main/Util/src/Option.cpp#12 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/OptionCallback.cpp b/Util/src/OptionCallback.cpp
index d52bbab8a..00448fe7a 100644
--- a/Util/src/OptionCallback.cpp
+++ b/Util/src/OptionCallback.cpp
@@ -1,7 +1,7 @@
 //
 // OptionCallback.cpp
 //
-// $Id: //poco/svn/Util/src/OptionCallback.cpp#1 $
+// $Id: //poco/Main/Util/src/OptionCallback.cpp#2 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/OptionException.cpp b/Util/src/OptionException.cpp
index 9999343aa..9e2c456ab 100644
--- a/Util/src/OptionException.cpp
+++ b/Util/src/OptionException.cpp
@@ -1,7 +1,7 @@
 //
 // OptionException.cpp
 //
-// $Id: //poco/svn/Util/src/OptionException.cpp#1 $
+// $Id: //poco/Main/Util/src/OptionException.cpp#8 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/OptionProcessor.cpp b/Util/src/OptionProcessor.cpp
index 102da8335..2d49c748d 100644
--- a/Util/src/OptionProcessor.cpp
+++ b/Util/src/OptionProcessor.cpp
@@ -1,7 +1,7 @@
 //
 // OptionProcessor.cpp
 //
-// $Id: //poco/svn/Util/src/OptionProcessor.cpp#1 $
+// $Id: //poco/Main/Util/src/OptionProcessor.cpp#8 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/OptionSet.cpp b/Util/src/OptionSet.cpp
index 2512b1cf0..017cd7e41 100644
--- a/Util/src/OptionSet.cpp
+++ b/Util/src/OptionSet.cpp
@@ -1,7 +1,7 @@
 //
 // OptionSet.cpp
 //
-// $Id: //poco/svn/Util/src/OptionSet.cpp#1 $
+// $Id: //poco/Main/Util/src/OptionSet.cpp#9 $
 //
 // Library: Util
 // Package: Options
@@ -89,7 +89,7 @@ bool OptionSet::hasOption(const std::string& name, bool matchShort) const
 	bool found = false;
 	for (Iterator it = _options.begin(); it != _options.end(); ++it)
 	{
-		if (matchShort && it->matchesShort(name) || !matchShort && it->matchesFull(name))
+		if ((matchShort && it->matchesShort(name)) || (!matchShort && it->matchesFull(name)))
 		{
 			if (!found)
 				found = true;
@@ -106,7 +106,7 @@ const Option& OptionSet::getOption(const std::string& name, bool matchShort) con
 	const Option* pOption = 0;
 	for (Iterator it = _options.begin(); it != _options.end(); ++it)
 	{
-		if (matchShort && it->matchesShort(name) || !matchShort && it->matchesPartial(name))
+		if ((matchShort && it->matchesShort(name)) || (!matchShort && it->matchesPartial(name)))
 		{
 			if (!pOption)
 			{
diff --git a/Util/src/RegExpValidator.cpp b/Util/src/RegExpValidator.cpp
index aa2ccb065..16caa4b82 100644
--- a/Util/src/RegExpValidator.cpp
+++ b/Util/src/RegExpValidator.cpp
@@ -1,7 +1,7 @@
 //
 // RegExpValidator.cpp
 //
-// $Id: //poco/svn/Util/src/RegExpValidator.cpp#1 $
+// $Id: //poco/Main/Util/src/RegExpValidator.cpp#2 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/ServerApplication.cpp b/Util/src/ServerApplication.cpp
index 76f81b8f9..3ab30d9b1 100644
--- a/Util/src/ServerApplication.cpp
+++ b/Util/src/ServerApplication.cpp
@@ -1,7 +1,7 @@
 //
 // ServerApplication.cpp
 //
-// $Id: //poco/Main/Util/src/ServerApplication.cpp#28 $
+// $Id: //poco/Main/Util/src/ServerApplication.cpp#29 $
 //
 // Library: Util
 // Package: Application
@@ -423,7 +423,8 @@ int ServerApplication::run(int argc, char** argv)
 		init(argc, argv);
 		if (runAsDaemon)
 		{
-			chdir("/");
+			int rc = chdir("/");
+			if (rc != 0) return EXIT_OSERR;
 		}
 	}
 	catch (Exception& exc)
diff --git a/Util/src/Subsystem.cpp b/Util/src/Subsystem.cpp
index a7bdb6300..f890621ff 100644
--- a/Util/src/Subsystem.cpp
+++ b/Util/src/Subsystem.cpp
@@ -1,7 +1,7 @@
 //
 // Subsystem.cpp
 //
-// $Id: //poco/svn/Util/src/Subsystem.cpp#1 $
+// $Id: //poco/Main/Util/src/Subsystem.cpp#8 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/src/Timer.cpp b/Util/src/Timer.cpp
index 149457691..be2ede65a 100644
--- a/Util/src/Timer.cpp
+++ b/Util/src/Timer.cpp
@@ -1,7 +1,7 @@
 //
 // Timer.cpp
 //
-// $Id: //poco/Main/Util/src/Timer.cpp#1 $
+// $Id: //poco/Main/Util/src/Timer.cpp#2 $
 //
 // Library: Util
 // Package: Timer
@@ -178,7 +178,7 @@ public:
 		if (!task()->isCancelled())
 		{
 			Poco::Timestamp nextExecution;
-			nextExecution += _interval*1000;
+			nextExecution += static_cast<Poco::Timestamp::TimeDiff>(_interval)*1000;
 			queue().enqueueNotification(this, nextExecution);
 			duplicate();
 		}
@@ -210,7 +210,7 @@ public:
 		if (!task()->isCancelled())
 		{
 			Poco::Timestamp nextExecution(task()->lastExecution());
-			nextExecution += _interval*1000;
+			nextExecution += static_cast<Poco::Timestamp::TimeDiff>(_interval)*1000;
 			queue().enqueueNotification(this, nextExecution);
 			duplicate();
 		}
@@ -259,7 +259,7 @@ void Timer::schedule(TimerTask::Ptr pTask, Poco::Timestamp time)
 void Timer::schedule(TimerTask::Ptr pTask, long delay, long interval)
 {
 	Poco::Timestamp time;
-	time += delay*1000;
+	time += static_cast<Poco::Timestamp::TimeDiff>(delay)*1000;
 	schedule(pTask, time, interval);
 }
 
@@ -273,7 +273,7 @@ void Timer::schedule(TimerTask::Ptr pTask, Poco::Timestamp time, long interval)
 void Timer::scheduleAtFixedRate(TimerTask::Ptr pTask, long delay, long interval)
 {
 	Poco::Timestamp time;
-	time += delay*1000;
+	time += static_cast<Poco::Timestamp::TimeDiff>(delay)*1000;
 	scheduleAtFixedRate(pTask, time, interval);
 }
 
diff --git a/Util/src/Validator.cpp b/Util/src/Validator.cpp
index fd8428123..565b3053f 100644
--- a/Util/src/Validator.cpp
+++ b/Util/src/Validator.cpp
@@ -1,7 +1,7 @@
 //
 // Validator.cpp
 //
-// $Id: //poco/svn/Util/src/Validator.cpp#1 $
+// $Id: //poco/Main/Util/src/Validator.cpp#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/src/WinRegistryConfiguration.cpp b/Util/src/WinRegistryConfiguration.cpp
index a21904471..46798a2df 100644
--- a/Util/src/WinRegistryConfiguration.cpp
+++ b/Util/src/WinRegistryConfiguration.cpp
@@ -1,7 +1,7 @@
 //
 // WinRegistryConfiguration.cpp
 //
-// $Id: //poco/1.3/Util/src/WinRegistryConfiguration.cpp#3 $
+// $Id: //poco/Main/Util/src/WinRegistryConfiguration.cpp#8 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp
index 37882105e..38bf6b9d1 100644
--- a/Util/src/WinRegistryKey.cpp
+++ b/Util/src/WinRegistryKey.cpp
@@ -1,7 +1,7 @@
 //
 // WinRegistryKey.cpp
 //
-// $Id: //poco/1.3/Util/src/WinRegistryKey.cpp#5 $
+// $Id: //poco/Main/Util/src/WinRegistryKey.cpp#14 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/src/WinService.cpp b/Util/src/WinService.cpp
index d6c8599f3..b68eb7a25 100644
--- a/Util/src/WinService.cpp
+++ b/Util/src/WinService.cpp
@@ -1,7 +1,7 @@
 //
 // WinService.cpp
 //
-// $Id: //poco/svn/Util/src/WinService.cpp#1 $
+// $Id: //poco/Main/Util/src/WinService.cpp#10 $
 //
 // Library: Util
 // Package: Windows