diff --git a/endpoints/verbs.py b/endpoints/verbs.py
index 6e9de7d90..8eb46bcc3 100644
--- a/endpoints/verbs.py
+++ b/endpoints/verbs.py
@@ -168,7 +168,7 @@ def _repo_verb(namespace, repository, tag, verb, formatter, checker=None, **kwar
 
 @verbs.route('/aci/<server>/<namespace>/<repository>/<tag>/aci/<os>/<arch>/', methods=['GET'])
 @process_auth
-def get_rocket_image(server, namespace, repository, tag, os, arch):
+def get_aci_image(server, namespace, repository, tag, os, arch):
   def checker(image_json):
     # Verify the architecture and os.
     operating_system = image_json.get('os', 'linux')
diff --git a/formats/aci.py b/formats/aci.py
index 156858ed2..1d82d8c6a 100644
--- a/formats/aci.py
+++ b/formats/aci.py
@@ -150,7 +150,7 @@ class ACIImage(TarImageFormatter):
 
     manifest = {
       "acKind": "ImageManifest",
-      "acVersion": "0.1.1",
+      "acVersion": "0.2.0",
       "name": '%s/%s/%s/%s' % (hostname, namespace, repository, tag),
       "labels": [
           {
@@ -172,7 +172,8 @@ class ACIImage(TarImageFormatter):
         "group": config.get('Group', '') or 'root',
         "eventHandlers": [],
         "workingDirectory": config.get('WorkingDir', ''),
-        "environment": {key:value for (key, value) in [e.split('=') for e in config.get('Env')]},
+        "environment": [(key, value)
+                        for (key, value) in [e.split('=') for e in config.get('Env')]],
         "isolators": self._build_isolators(config),
         "mountPoints": self._build_volumes(config),
         "ports": self._build_ports(config),
diff --git a/test/data/test.db b/test/data/test.db
index cdaa66e57..c37aec119 100644
Binary files a/test/data/test.db and b/test/data/test.db differ
diff --git a/util/tarlayerformat.py b/util/tarlayerformat.py
index 3d6ddd94b..37aee16a7 100644
--- a/util/tarlayerformat.py
+++ b/util/tarlayerformat.py
@@ -39,6 +39,9 @@ class TarLayerFormat(object):
 
         # Yield the tar header.
         if self.path_prefix:
+          # Note: We use a copy here because we need to make sure we copy over all the internal
+          # data of the tar header. We cannot use frombuf(tobuf()), however, because it doesn't
+          # properly handle large filenames.
           clone = copy.deepcopy(tar_info)
           clone.name = os.path.join(self.path_prefix, clone.name)
           yield clone.tobuf()