diff --git a/build.py b/build.py
index a65f7097..22a0aab5 100755
--- a/build.py
+++ b/build.py
@@ -56,15 +56,23 @@ if options.clean:
 if not os.path.exists(built_dir):
     os.mkdir(built_dir)
 
+if not os.path.isdir('build'):
+    os.makedirs('build')
+
 for app in apps:
 
+    if app['disabled']:
+        print "Skipping %s: disabled" % app['id']
+    elif not app['builds']:
+        print "Skipping %s: no builds specified" % app['id']
+
     if (app['disabled'] is None and app['repo'] != '' 
             and app['repotype'] != '' and (options.package is None or
             options.package == app['id']) and len(app['builds']) > 0):
 
         print "Processing " + app['id']
 
-        build_dir = 'build_' + app['id']
+        build_dir = 'build/' + app['id']
 
         got_source = False
 
@@ -428,7 +436,7 @@ for app in apps:
                     output = p.communicate()[0]
                     if p.returncode != 0:
                         print output
-                        print "NDK build failed"
+                        print "NDK build failed for %s:%s" % (app['id'], thisbuild['version'])
                         sys.exit(1)
                     elif options.verbose:
                         print output
@@ -448,7 +456,7 @@ for app in apps:
                 output = p.communicate()[0]
                 if p.returncode != 0:
                     print output
-                    print "Build failed"
+                    print "Build failed for %s:%s" % (app['id'], thisbuild['version'])
                     sys.exit(1)
                 elif options.verbose:
                     print output
diff --git a/common.py b/common.py
index 16825eae..1c12f94c 100644
--- a/common.py
+++ b/common.py
@@ -153,7 +153,7 @@ def parse_metadata(metafile, **kw):
 
 def read_metadata(verbose=False):
     apps = []
-    for metafile in glob.glob(os.path.join('metadata', '*.txt')):
+    for metafile in sorted(glob.glob(os.path.join('metadata', '*.txt'))):
         if verbose:
             print "Reading " + metafile
         apps.append(parse_metadata(metafile, verbose=verbose))