diff --git a/.github/codecov.yml b/.github/codecov.yml
index f5a9dcf97b..679a2f56f9 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -1,6 +1,4 @@
 coverage:
-  strict_yaml_branch: default
-  max_report_age: off
   status:
     project:
       default:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index d2c1b4ea4a..ad0ea7a220 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -30,7 +30,9 @@ jobs:
       - name: Setup Ubuntu
         run: |
             sudo apt update -y
-            sudo apt install -y tar wget make cmake gcc g++ python3 python3-dev "openmpi-*" libopenmpi-dev libblas-dev liblapack-dev
+            sudo apt install -y tar wget make cmake gcc g++ python3 \
+                python3-dev "openmpi-*" libopenmpi-dev hdf5-tools \
+                libfftw3-dev libhdf5-dev libblas-dev liblapack-dev
 
       - name: Build
         run: /bin/bash mfc.sh build -j $(nproc) --gcov
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 921eedf66a..b7f087c25b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,7 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
         add_compile_options(
             $<$<COMPILE_LANGUAGE:Fortran>:-fprofile-arcs>
             $<$<COMPILE_LANGUAGE:Fortran>:-ftest-coverage>
+            $<$<COMPILE_LANGUAGE:Fortran>:-O1>
 	    )
 
         add_link_options(
@@ -360,6 +361,8 @@ macro(HANDLE_SOURCES target useCommon)
                                  -D chemistry=False
                                  --line-numbering
                                  --no-folding
+								 --line-length=999
+		 						 --line-numbering-mode=nocontlines
                                  "${fpp}" "${f90}"
             DEPENDS  "${fpp};${${target}_incs}"
             COMMENT  "Preprocessing (Fypp) ${fpp_filename}"