diff --git a/VERSION b/VERSION
index 95e4690647feb1d7cbd01e7994a036044ef09297..f335f1fb6f68c35f86caa0e79ec4e3943b0719f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-3.0.0b56
+3.0.0b57
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index d10fbeb1dcab0fe53b3c8bb54124cf6f1351820f..13a4d471000bf43e6240f2889084261f968ab8d8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -64,7 +64,7 @@ copyright = u'2016, BSC-CNS Earth Sciences Department'
 # The short X.Y version.
 version = '3.0b'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.0b56'
+release = '3.0.0b57'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/earthdiagnostics/EarthDiagnostics.pdf b/earthdiagnostics/EarthDiagnostics.pdf
index 1b317743d063e69a71400c28b667fc38d8c41c41..ba033c441e40d6e9b2487ec9ccb8cbea54be6ec2 100644
Binary files a/earthdiagnostics/EarthDiagnostics.pdf and b/earthdiagnostics/EarthDiagnostics.pdf differ
diff --git a/earthdiagnostics/earthdiags.py b/earthdiagnostics/earthdiags.py
index bc276976ea2c7062a0942c5230f7dcfdd428a604..cc8fe5a90c6e3e227912a0e3c432eee84f1a0bb6 100755
--- a/earthdiagnostics/earthdiags.py
+++ b/earthdiagnostics/earthdiags.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # coding=utf-8
-from six.moves.queue import Queue
+from six.moves import queue as q
 import argparse
 import shutil
 import threading
@@ -239,7 +239,7 @@ class EarthDiags(object):
         Log.info('')
 
     def prepare_job_list(self):
-        list_jobs = Queue()
+        list_jobs = q.Queue()
         for fulldiag in self.config.get_commands():
             Log.info("Adding {0} to diagnostic list", fulldiag)
             diag_options = fulldiag.split(',')
@@ -410,7 +410,7 @@ class EarthDiags(object):
                 else:
                     failed_jobs.append(str(job))
                 queue.task_done()
-            except Queue.Empty:
+            except q.Queue.Empty:
                 continue
 
         if len(failed_jobs) == 0:
diff --git a/earthdiagnostics/ocean/interpolate.py b/earthdiagnostics/ocean/interpolate.py
index 4b22352678f9bf7af4ba21b855bf7c3aa5884abf..8784fe84feb4dd66811d0984ea0e94aedcdd6863 100644
--- a/earthdiagnostics/ocean/interpolate.py
+++ b/earthdiagnostics/ocean/interpolate.py
@@ -133,7 +133,7 @@ class Interpolate(Diagnostic):
         if 'record' in handler.dimensions:
             handler.renameDimension('record', 'lev')
         handler.close()
-        nco.ncpdq(input=temp, output=temp, options=('-O -h -a time,lev',))
+        nco.ncpdq(input=temp, output=temp, options=('-h -a time,lev',))
 
         if has_levels:
             nco.ncks(input=variable_file, output=temp, options=('-A -v lev',))
@@ -146,7 +146,7 @@ class Interpolate(Diagnostic):
             cdo.invertlatdata(input=temp2, output=temp)
             shutil.move(temp, temp2)
         if not has_levels:
-            nco.ncks(input=temp2, output=temp2, options=('-O -v {0},lat,lon,time'.format(self.variable),))
+            nco.ncks(input=temp2, output=temp2, options=('-v {0},lat,lon,time'.format(self.variable),))
 
         self.send_file(temp2, self.domain, self.variable, self.startdate, self.member, self.chunk, grid=self.grid)
 
@@ -161,7 +161,7 @@ class Interpolate(Diagnostic):
         temp = TempFile.get()
         if has_levels:
             nco.ncks(input=input_file, output=temp, options='-O -d lev,{0} -v {1},lat,lon'.format(lev, self.variable))
-            nco.ncwa(input=temp, output=temp, options=('-O -h -a lev',))
+            nco.ncwa(input=temp, output=temp, options=('-h -a lev',))
         else:
             shutil.copy(input_file, temp)
         namelist_file = TempFile.get(suffix='')
@@ -180,6 +180,6 @@ class Interpolate(Diagnostic):
         Utils.execute_shell_command('/home/Earth/jvegas/pyCharm/cfutools/interpolation/scrip_use '
                                     '{0}'.format(namelist_file), Log.DEBUG)
         os.remove(namelist_file)
-        nco.ncecat(input=temp, output=temp, options=("-O -h",))
+        nco.ncecat(input=temp, output=temp, options=("-h",))
         shutil.move(temp, self._get_level_file(lev))
         Log.debug("Level {0} ready", lev)