Some fixes for hydra
Merge remote-tracking branch 'origin/fortran-backend-and-apps' into fortran-backend-and-apps