diff --git a/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala b/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala
index 112da3f3ce0bea0a06b2a66a5b12570192f9bea5..b7b9e3b3acc3da468959af397df4df6418572c7a 100644
--- a/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala
+++ b/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala
@@ -231,7 +231,7 @@ class Flexiprep(val root:Configurable) extends QScript with BiopetQScript {
     if (filename.endsWith(".gzip")) filename = filename.substring(0,filename.size - 5)
     if (filename.endsWith(".fastq")) filename = filename.substring(0,filename.size - 6)
     //if (filename.endsWith(".fq")) filename = filename.substring(0,filename.size - 3)
-    fastqcCommand.output = outDir + "/" + filename + "_fastqc.ouput"
+    fastqcCommand.output = outDir + "/" + filename + "_fastqc.output"
     fastqcCommand.afterGraph
     add(fastqcCommand)
     return fastqcCommand
diff --git a/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala b/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala
index aaf4fe3528ad9d8cff2b9f9d3dbad41ef0c7e259..d67b4fa80b69e698a26473954c530a278baf62ad 100644
--- a/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala
+++ b/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala
@@ -109,7 +109,8 @@ class Mapping(val root:Configurable) extends QScript with BiopetQScript {
       flexiprep.input_R1 = fastq_R1
       if (paired) flexiprep.input_R2 = fastq_R2
       flexiprep.outputDir = outputDir + "flexiprep/"
-      flexiprep.script
+      flexiprep.init
+      flexiprep.biopetScript
       addAll(flexiprep.functions) // Add function of flexiprep to curent function pool
       fastq_R1 = flexiprep.outputFiles("output_R1")
       if (paired) fastq_R2 = flexiprep.outputFiles("output_R2")