diff --git a/wscript b/wscript
index 08b1cc69984..f1c9b6274c1 100644
--- a/wscript
+++ b/wscript
@@ -161,7 +161,7 @@ def svninfo(*args):
 
 def gitinfo(dir=None):
 	if dir and not _isdir(dir): return ''
-	try: p = _Popen(['git','rev-parse', '--short', 'HEAD'],stdin=PIPE,stdout=PIPE,stderr=PIPE,cwd=dir)
+	try: p = _Popen(['git','remote','show','-n','origin'],stdin=PIPE,stdout=PIPE,stderr=PIPE,cwd=dir)
 	except OSError,e:
 		if e.errno == 2: return '' # svn command is not installed
 		raise
@@ -194,7 +194,7 @@ def allgitinfo():
 	
 	return t + "\n\ncloustack-proprietary:\n" + u
 
-def _getbuildnumber():
+def _getbuildnumber(): # FIXME implement for git
 	n = Options.options.BUILDNUMBER
 	if n:
 		# luntbuild prepends "build-" to the build number.  we work around this here:
@@ -203,8 +203,8 @@ def _getbuildnumber():
 		if n.startswith("$Revision:"): n = n[11:-2].strip()
 		return n
 	else:
-		# Try to guess the Git revision number
-		stdout = gitinfo()
+		# Try to guess the SVN revision number by calling SVN info.
+		stdout = svninfo()
 		if not stdout: return ''
 		# Filter lines.
 		rev = [ x for x in stdout.splitlines() if x.startswith('SVN Revision') ]
diff --git a/wscript_configure b/wscript_configure
index 2caa27dc833..965847dd101 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -222,6 +222,19 @@ conf.check_tool('java')
 conf.check_tool("python")
 conf.check_python_version((2,4,0))
 
+conf.check_message_1('Detecting Python MySQL module')
+try: import MySQLdb
+except ImportError,e:
+	raise Configure.ConfigurationError, "The Python MySQLdb module could not be found.\nOn Linux: ./waf installrpmdeps or ./waf installdebdeps according to your distro's package format.\nOn Windows: Install MySQL 5.1 on your machine, then install the Python MySQLdb module for Python %s.\nThe module for Python 2.6 / win32 / MySQL 5.1 is available here: http://soemin.googlecode.com/files/MySQL-python-1.2.3c1.win32-py2.6.exe"%conf.env.PYTHON_VERSION
+conf.check_message_2('MySQLdb','GREEN')
+conf.check_message_1('Database info for developer setup')
+for a in "DBHOST DBUSER DBPW".split(): conf.env[a] = getattr(Options.options, a, '')
+conf.check_message_2("user: %r, password: %r, host: %r"%(conf.env.DBUSER,conf.env.DBPW,conf.env.DBHOST),'GREEN')
+
+try: conf.check_tool("tomcat")
+except Configure.ConfigurationError,e:
+	conf.fatal("Tomcat directory %r not found.  Either install Tomcat using ./waf installrpmdeps or ./waf installdebdeps, or manually install Tomcat to a directory in your system and set the environment variable TOMCAT_HOME to point to it."%conf.env.TOMCATHOME)
+
 conf.env.COMMONPATH = _join(conf.env.PACKAGE,"common")
 conf.env.AGENTPATH = _join(conf.env.PACKAGE,"agent")
 conf.env.CPPATH = _join(conf.env.PACKAGE,"console-proxy")