diff --git a/org.lflang/src/org/lflang/TargetProperty.java b/org.lflang/src/org/lflang/TargetProperty.java
index 782b368ce6..f0de831bf4 100644
--- a/org.lflang/src/org/lflang/TargetProperty.java
+++ b/org.lflang/src/org/lflang/TargetProperty.java
@@ -632,7 +632,6 @@ public enum TargetProperty {
                 }
             }),
 
-
     /**
      * Directive to let the runtime export its internal dependency graph.
      *
@@ -876,7 +875,7 @@ private interface PropertyGetter {
         this.supportedBy = supportedBy;
         this.getter = getter;
         this.setter = setter;
-        this.updater = (config, value, err) -> { /* Ignore the update by default */ };
+        this.updater = setter; // (Re)set by default
     }
 
     /**
diff --git a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
index 093ea2b760..a96c1d17a2 100644
--- a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
+++ b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
@@ -43,6 +43,7 @@
 import org.lflang.generator.CodeMap;
 import org.lflang.generator.DockerData;
 import org.lflang.generator.FedDockerComposeGenerator;
+import org.lflang.generator.GeneratorResult;
 import org.lflang.generator.GeneratorResult.Status;
 import org.lflang.generator.GeneratorUtils;
 import org.lflang.generator.IntegratedBuilder;
@@ -170,12 +171,17 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
             ));
         }
 
+        if (context.getTargetConfig().noCompile) {
+            context.finish(Status.GENERATED, lf2lfCodeMapMap);
+            return false;
+        }
+
         Map<Path, CodeMap> codeMapMap = compileFederates(context, lf2lfCodeMapMap, (subContexts) -> {
             if (context.getTargetConfig().dockerOptions == null) return;
             final List<DockerData> services = new ArrayList();
             // 1. create a Dockerfile for each federate
             subContexts.forEach((subContext) -> {
-                // Inherit Docker properties from main context
+                // Inherit Docker options from main context
                 subContext.getTargetConfig().dockerOptions = context.getTargetConfig().dockerOptions;
                 var dockerGenerator = dockerGeneratorFactory(subContext);
                 var dockerData = dockerGenerator.generateDockerData();
@@ -198,7 +204,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
         });
 
         context.finish(Status.COMPILED, codeMapMap);
-        return false; // FIXME why false?
+        return false;
     }
 
     /**