diff --git a/meta-arm/scripts/machine-summary.py b/meta-arm/scripts/machine-summary.py
index 0f5d1d9..477bdfc 100755
--- a/meta-arm/scripts/machine-summary.py
+++ b/meta-arm/scripts/machine-summary.py
@@ -139,6 +139,7 @@
 
 # TODO can this be inferred from the list of recipes in the layer
 recipes = ("virtual/kernel",
+           "sbsa-acs",
            "scp-firmware",
            "trusted-firmware-a",
            "trusted-firmware-m",
diff --git a/meta-arm/scripts/runfvp b/meta-arm/scripts/runfvp
index 0ca3a1b..135cf04 100755
--- a/meta-arm/scripts/runfvp
+++ b/meta-arm/scripts/runfvp
@@ -79,7 +79,7 @@
                 print(line.strip().decode(errors='ignore'))
 
     finally:
-        fvp.stop()
+        return fvp.stop()
 
 
 def runfvp(cli_args):
@@ -88,7 +88,7 @@
         config_file = args.config
     else:
         config_file = conffile.find(args.config)
-    start_fvp(args, config_file, extra_args)
+    return start_fvp(args, config_file, extra_args)
 
 
 if __name__ == "__main__":