diff --git a/Source/Python/Classes/ControlFile.py b/Source/Python/Classes/ControlFile.py
index 6665ae6950a48003796ca57e1a82c78852042a5c..5fd17989d04fc34a2f1bf4e563da4bdffa3102a4 100644
--- a/Source/Python/Classes/ControlFile.py
+++ b/Source/Python/Classes/ControlFile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Leopold Haimberger (University of Vienna)
diff --git a/Source/Python/Classes/EcFlexpart.py b/Source/Python/Classes/EcFlexpart.py
index a8cc86d367a3a021f0428261be1e7e2ac128c41c..7326e86c5cae5b000c40d7fa5994be44ff9964ba 100644
--- a/Source/Python/Classes/EcFlexpart.py
+++ b/Source/Python/Classes/EcFlexpart.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
@@ -845,8 +845,8 @@ class EcFlexpart(object):
 
             if area[1] > area[3]:
                 area[1] -= 360
-            maxl = round((area[3] - area[1]) / grid[1]) + 1
-            maxb = round((area[0] - area[2]) / grid[0]) + 1
+            maxl = int(round((area[3] - area[1]) / grid[1])) + 1
+            maxb = int(round((area[0] - area[2]) / grid[0])) + 1
 
             stream = namelist_template.generate(
                 maxl = str(maxl),
diff --git a/Source/Python/Classes/GribUtil.py b/Source/Python/Classes/GribUtil.py
index 2bbdf7432bdc724bf15692f455b3d9ac3470e55a..b7a66a2c4a6cef2a59a75598f1a5021115575cde 100644
--- a/Source/Python/Classes/GribUtil.py
+++ b/Source/Python/Classes/GribUtil.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
diff --git a/Source/Python/Classes/MarsRetrieval.py b/Source/Python/Classes/MarsRetrieval.py
index a1b843e7fdb2488faf54e20ce4642fdd06bbf392..c87f878afdf66e7f829a40c43982bf604b5cc3eb 100644
--- a/Source/Python/Classes/MarsRetrieval.py
+++ b/Source/Python/Classes/MarsRetrieval.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
diff --git a/Source/Python/Classes/UioFiles.py b/Source/Python/Classes/UioFiles.py
index a091ddc23ee372cb6b0d9506d9851def55af61de..8c1c26966cdbf0bb3ab3850fdb9123a19ed58529 100644
--- a/Source/Python/Classes/UioFiles.py
+++ b/Source/Python/Classes/UioFiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
diff --git a/Source/Python/Mods/checks.py b/Source/Python/Mods/checks.py
index 0250ffeb80e796b6ac6d9409880b22a0aefdf8e9..54db0dcabfbfaf45f88e1d9c8747b77c94c48e08 100644
--- a/Source/Python/Mods/checks.py
+++ b/Source/Python/Mods/checks.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Philipp (University of Vienna)
diff --git a/Source/Python/Mods/disaggregation.py b/Source/Python/Mods/disaggregation.py
index 5407ca1c8481ada9c95d56e379f48604497eead2..a5d36ca3612f8cf7e4468728c6b98041c9eebb9d 100644
--- a/Source/Python/Mods/disaggregation.py
+++ b/Source/Python/Mods/disaggregation.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Philipp (University of Vienna)
diff --git a/Source/Python/Mods/get_mars_data.py b/Source/Python/Mods/get_mars_data.py
index 2329b8436c702c849f6273295e8954714a211a6a..e3c794752768a9ab377e9aa024a5fac6a5334b3c 100755
--- a/Source/Python/Mods/get_mars_data.py
+++ b/Source/Python/Mods/get_mars_data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
diff --git a/Source/Python/Mods/prepare_flexpart.py b/Source/Python/Mods/prepare_flexpart.py
index efa4f5eb4b07516b1b977cf6c47df82ca694e0a6..ba4026ef31b74048823ff9571704d423411a7e62 100755
--- a/Source/Python/Mods/prepare_flexpart.py
+++ b/Source/Python/Mods/prepare_flexpart.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
diff --git a/Source/Python/Mods/profiling.py b/Source/Python/Mods/profiling.py
index f89e672cbf5373bf244c120a3bb22d2916b71e7b..c95e4e05dbb10dfcdda72b6ba0d98242929ec9f0 100644
--- a/Source/Python/Mods/profiling.py
+++ b/Source/Python/Mods/profiling.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #************************************************************************
 # ToDo AP
diff --git a/Source/Python/Mods/tools.py b/Source/Python/Mods/tools.py
index 0a431026f34f52d943eb0d29c4843628450c5b46..5b57f3078f60492cd5270bb318546f25d9ef6a15 100644
--- a/Source/Python/Mods/tools.py
+++ b/Source/Python/Mods/tools.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Philipp (University of Vienna)
diff --git a/Source/Python/_config.py b/Source/Python/_config.py
index 16a5940bb0e4b6d7f19324c09daa380cb4ada253..591a6c9cfbc19b58ef4f0a31880fa23bae9f01e9 100644
--- a/Source/Python/_config.py
+++ b/Source/Python/_config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Philipp (University of Vienna)
diff --git a/Source/Python/install.py b/Source/Python/install.py
index 4d408ff754ac913df0ec4d0201af5a9061dc4529..172a0600fdacf448ddaf079ebcb8ca3e475316c4 100755
--- a/Source/Python/install.py
+++ b/Source/Python/install.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Leopold Haimberger (University of Vienna)
diff --git a/Source/Python/submit.py b/Source/Python/submit.py
index 478dad57600250efe6f596ac36d6c63368d433bf..399ffbaf9fd74663290aa3cc6b1d58164d1c88a9 100755
--- a/Source/Python/submit.py
+++ b/Source/Python/submit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #*******************************************************************************
 # @Author: Anne Fouilloux (University of Oslo)
diff --git a/Templates/compilejob.template b/Templates/compilejob.template
index bf83f1887a10d415338887ca0210e3c52e84ab9f..d96c1655a7fc55d7e532a52efd8d8f5823cc31b0 100644
--- a/Templates/compilejob.template
+++ b/Templates/compilejob.template
@@ -31,8 +31,8 @@ case $${HOST} in
   module unload eccodes
   module unload python
   module unload emos
-  module load python
-  module load eccodes/2.12.0
+  module load python3/3.6.8-01
+  module load eccodes/2.12.5
   module load emos/455-r64
   export FLEXPART_ROOT_SCRIPTS=$fp_root_scripts
   export MAKEFILE=$makefile
@@ -41,8 +41,8 @@ case $${HOST} in
   module unload python
   module switch PrgEnv-cray PrgEnv-intel
   module load python3
-  module load eccodes/2.12.0
-  module load emos
+  module load eccodes/2.12.5
+  module load emos/455-r64
   echo $${GROUP}
   echo $${HOME}
   echo $${HOME} | awk -F / '{print $1, $2, $3, $4}'
diff --git a/Templates/job.temp b/Templates/job.temp
index 922473588b25e701a38879cb8ca1b941fe674c77..df2e537c0099f8659a42e29130e86d053a32d03a 100644
--- a/Templates/job.temp
+++ b/Templates/job.temp
@@ -31,8 +31,8 @@ case $${HOST} in
   module unload eccodes
   module unload python
   module unload emos
-  module load python/2.7.15-01
-  module load eccodes/2.12.0
+  module load python3/3.6.8-01
+  module load eccodes/2.12.5
   module load emos/455-r64
   export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/Source/Python
   ;;
@@ -40,8 +40,8 @@ case $${HOST} in
   module unload python
   module switch PrgEnv-cray PrgEnv-intel
   module load python3
-  module load eccodes/2.12.0
-  module load emos
+  module load eccodes/2.12.5
+  module load emos/455-r64
   export SCRATCH=$${TMPDIR}
   export PATH=$${PATH}:$${HOME}/flex_extract_v7.1/Source/Python
   ;;
diff --git a/Templates/job.template b/Templates/job.template
index 32ddd251b88eebff66e695a5b8a1dd65843adca3..bdd115188bf9254822d07956cd0337bce2ca6612 100644
--- a/Templates/job.template
+++ b/Templates/job.template
@@ -31,8 +31,8 @@ case $$$${HOST} in
   module unload eccodes
   module unload python
   module unload emos
-  module load python
-  module load eccodes/2.12.0
+  module load python3/3.6.8-01
+  module load eccodes/2.12.5
   module load emos/455-r64
   export PATH=$$$${PATH}:$fp_root_path
   ;;
@@ -40,8 +40,8 @@ case $$$${HOST} in
   module unload python
   module switch PrgEnv-cray PrgEnv-intel
   module load python3
-  module load eccodes/2.12.0
-  module load emos
+  module load eccodes/2.12.5
+  module load emos/455-r64
   export SCRATCH=$$$${TMPDIR}
   export PATH=$$$${PATH}:$fp_root_path
   ;;