--- a/mx/mx_graal.py	Tue Jul 15 19:15:46 2014 -0700
+++ b/mx/mx_graal.py	Tue Jul 15 19:21:28 2014 -0700
@@ -1281,6 +1281,12 @@
         dacapo(['-Xbatch', 'pmd'])
         tasks.append(t.stop())
 
+    # ensure -Xcomp still works
+    with VM('graal', 'product'):
+        t = Task('XCompMode:product')
+        vm(['-Xcomp', '-version'])
+        tasks.append(t.stop())
+
     if args.jacocout is not None:
         jacocoreport([args.jacocout])
 
@@ -2049,7 +2055,7 @@
             tmp = tempfile.mkdtemp(prefix='findbugs-download-tmp', dir=_graal_home)
             try:
                 findbugsDist = join(tmp, 'findbugs.zip')
-                mx.download(findbugsDist, ['http://sourceforge.net/projects/findbugs/files/findbugs/3.0.0/findbugs-3.0.0-dev-20131204-e3cbbd5.zip'])
+                mx.download(findbugsDist, ['http://lafo.ssw.uni-linz.ac.at/graal-external-deps/findbugs-3.0.0.zip', 'http://sourceforge.net/projects/findbugs/files/findbugs/3.0.0/findbugs-3.0.0.zip'])
                 with zipfile.ZipFile(findbugsDist) as zf:
                     candidates = [e for e in zf.namelist() if e.endswith('/lib/findbugs.jar')]
                     assert len(candidates) == 1, candidates