diff --git a/Build/Build.bat b/Build/Build.bat
index 5580ecdd..3b36973f 100644
--- a/Build/Build.bat
+++ b/Build/Build.bat
@@ -80,7 +80,7 @@ echo * Updated Version.h
 :: Set vcbuild environment variables and begin build
 echo * Starting build for %VERSION%
 for /F "tokens=1-4 delims=:.," %%a in ("%TIME%") do (
-	set /A "BUILD_BEGIN_TIMESTAMP=(((%%a * 60) + 1%%b %% 100)* 60+1%%c %% 100) * 100 + 1%%d %% 100"
+	set /A "BUILD_BEGIN_TIMESTAMP=(((%%a * 60) + 1%%b %% 100)* 60 + 1%%c %% 100) * 100 + 1%%d %% 100"
 )
 
 :: Build Library
@@ -158,7 +158,7 @@ if not "%CERTFILE%" == "" (
 if exist "BuildLog.txt" del "BuildLog.txt"
 
 for /F "tokens=1-4 delims=:.," %%a in ("%TIME%") do (
-	set /A "BUILD_END_TIMESTAMP=(((%%a * 60) + 1%%b %% 100)* 60+1%%c %% 100) * 100 + 1%%d %% 100"
+	set /A "BUILD_END_TIMESTAMP=(((%%a * 60) + 1%%b %% 100)* 60 + %%c %% 100) * 100 + 1%%d %% 100"
 )
 set /A "BUILD_ELAPSED_TIME=(%BUILD_END_TIMESTAMP% - %BUILD_BEGIN_TIMESTAMP%) / 100"
 echo * Build complete. Elapsed time: %BUILD_ELAPSED_TIME% sec
diff --git a/Common/PathUtil.cpp b/Common/PathUtil.cpp
index 139b0da1..df9c7d2f 100644
--- a/Common/PathUtil.cpp
+++ b/Common/PathUtil.cpp
@@ -102,7 +102,7 @@ void ExpandEnvironmentVariables(std::wstring& path)
 		DWORD bufSize = 4096;
 		WCHAR* buffer = new WCHAR[bufSize];
 
-		// %APPDATA% is a special casem
+		// %APPDATA% is a special case.
 		pos = path.find(L"%APPDATA%", pos);
 		if (pos != std::wstring::npos)
 		{
@@ -146,5 +146,4 @@ void ExpandEnvironmentVariables(std::wstring& path)
 	}
 }
 
-
 }  // namespace PathUtil