diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java b/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java
index e5474ca1bf4..ca7fa15ecd6 100644
--- a/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java
+++ b/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java
@@ -478,7 +478,6 @@ private Filer scratchFiler() throws IOException {
     private Optional<Path> codegenResourceFilerOut(String outPath,
                                                    String body,
                                                    Optional<Function<InputStream, String>> optFnUpdater) {
-        outPath = outPath.replace("\\", "/");
         Messager messager = messager();
         if (!filerWriterEnabled()) {
             messager.log("(disabled) Writing " + outPath + " with:\n" + body);
diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/ModuleInfoDescriptorSupport.java b/pico/tools/src/main/java/io/helidon/pico/tools/ModuleInfoDescriptorSupport.java
index b8d9f0c4978..847832b94c1 100644
--- a/pico/tools/src/main/java/io/helidon/pico/tools/ModuleInfoDescriptorSupport.java
+++ b/pico/tools/src/main/java/io/helidon/pico/tools/ModuleInfoDescriptorSupport.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
+import io.helidon.build.common.Strings;
 import io.helidon.builder.api.Prototype;
 import io.helidon.common.types.TypeName;
 
@@ -270,7 +271,7 @@ private static String cleanModuleAnnotations(String moduleText) {
             // ignored, we cannot get an exception when closing string reader
         }
 
-        return response.toString();
+        return Strings.normalizeNewLines(response.toString());
     }
 
     private static String cleanLine(String line) {