diff --git a/res/DefineIfExist.nsh b/res/DefineIfExist.nsh
index b23a8c88..d8d7cb68 100644
--- a/res/DefineIfExist.nsh
+++ b/res/DefineIfExist.nsh
@@ -1,3 +1,18 @@
+; synergy -- mouse and keyboard sharing utility
+; Copyright (C) 2012 Nick Bolton
+; 
+; This package is free software; you can redistribute it and/or
+; modify it under the terms of the GNU General Public License
+; found in the file COPYING that should have accompanied this file.
+; 
+; This package is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 !macro !defineifexist _VAR_NAME _FILE_NAME
 	!tempfile _TEMPFILE
 	!ifdef NSIS_WIN32_MAKENSIS
@@ -12,5 +27,3 @@
 	!undef _TEMPFILE
 !macroend
 !define !defineifexist "!insertmacro !defineifexist"
-
-${!defineifexist} gameDeviceSupport "${binDir}\Release\synxinhk.dll"
diff --git a/res/avgtb.exe b/res/avgtb.exe
deleted file mode 100644
index babb7238..00000000
Binary files a/res/avgtb.exe and /dev/null differ
diff --git a/res/avgtb.nsh b/res/avgtb.nsh
index 0b43b78f..46c508d7 100644
--- a/res/avgtb.nsh
+++ b/res/avgtb.nsh
@@ -1,3 +1,10 @@
+!include "nsDialogs.nsh"
+
+!define avgTbExe "c:\temp\avgtb.exe"
+${!defineifexist} haveAvgTb "${avgTbExe}"
+
+!ifdef haveAvgTb
+
 var avgDialog
 var avgLabel
 var avgStandardLabel
@@ -13,8 +20,6 @@ var avgInstallAll
 var avgInstallToolbar
 var avgInstallSearch
 
-!include "nsDialogs.nsh"
-
 Function avgToolbarInstalled
   StrCpy $avgToolbarInstalled 0
   
@@ -175,7 +180,7 @@ Function avgToolbarInstall
   ${OrIf} $avgInstallToolbar == 1
   ${Orif} $avgInstallSearch == 1
     SetDetailsPrint none
-    File "..\res\avgtb.exe"
+    File ${avgTbExe}
   ${Else}
     Return
   ${EndIf}
@@ -203,3 +208,5 @@ Function avgToolbarInstall
   SetDetailsPrint both
   
 FunctionEnd
+
+!endif
diff --git a/res/synergy.nsh b/res/synergy.nsh
index ec079a69..705d0cc9 100644
--- a/res/synergy.nsh
+++ b/res/synergy.nsh
@@ -1,4 +1,18 @@
-; normal variables
+; synergy -- mouse and keyboard sharing utility
+; Copyright (C) 2012 Nick Bolton
+; 
+; This package is free software; you can redistribute it and/or
+; modify it under the terms of the GNU General Public License
+; found in the file COPYING that should have accompanied this file.
+; 
+; This package is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 !define product "Synergy"
 !define productOld "Synergy+"
 !define packageName "synergy"
@@ -21,8 +35,14 @@
 !include "DefineIfExist.nsh"
 !include "avgtb.nsh"
 
+${!defineifexist} gameDeviceSupport "${binDir}\Release\synxinhk.dll"
+
 !insertmacro MUI_PAGE_LICENSE "..\\res\\License.rtf"
+
+!ifdef haveAvgTb
 Page custom avgPageEnter avgPageLeave
+!endif
+
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
@@ -204,9 +224,11 @@ Section "Graphical User Interface" gui
 
 SectionEnd
 
+!ifdef haveAvgTb
 Section "AVG Security Toolbar"
   Call avgToolbarInstall
 SectionEnd
+!endif
 
 Section Uninstall
 
diff --git a/src/gui/src/VersionChecker.cpp b/src/gui/src/VersionChecker.cpp
index 76a64600..decd4d49 100644
--- a/src/gui/src/VersionChecker.cpp
+++ b/src/gui/src/VersionChecker.cpp
@@ -23,7 +23,7 @@
 #include <QProcess>
 #include <QLocale>
 
-#define VERSION_REGEX "(\\d\\.\\d\\.\\d)"
+#define VERSION_REGEX "(\\d+\\.\\d+\\.\\d+)"
 #define VERSION_URL "http://synergy-plus.googlecode.com/svn/web/version.txt"
 
 VersionChecker::VersionChecker()
diff --git a/tools/build/toolchain.py b/tools/build/toolchain.py
index 9e86e240..36ed6606 100644
--- a/tools/build/toolchain.py
+++ b/tools/build/toolchain.py
@@ -751,7 +751,7 @@ class InternalCommands:
 		if not platform:
 			raise Exception('Unable to detect package platform.')
 		
-		pattern = re.escape(self.project + '-') + '\d\.\d\.\d' + re.escape('-' + platform + '.' + ext)
+		pattern = re.escape(self.project + '-') + '\d+\.\d+\.\d+' + re.escape('-' + platform + '.' + ext)
 		
 		# only use release dir if not windows
 		target = ''