diff --git a/bin/define_tasks_from_archive.py b/bin/define_tasks_from_archive.py
index 59457583f85dc3f476a091e349543fbaf432ada1..7015e325573f8dbc1a3e484754d0eb9bf66ae991 100644
--- a/bin/define_tasks_from_archive.py
+++ b/bin/define_tasks_from_archive.py
@@ -164,7 +164,7 @@ def main():
             logging.info('creating task for sas_id %s - dataset %s', sas_id, index)
             payload = create_payload_from_entry(line, args.filter, args.workflow, args.averaging_window, args.stations)
             atdb_interface.submit_task(payload)
-
+            break #only one dataset
 
 if __name__ == '__main__':
     main()
diff --git a/bin/scintillation_utils.py b/bin/scintillation_utils.py
index a0ad0e0e9a350abb3ac5382782f2be9237430bb4..2686d2bde23104b51ec5c5a62ff0a083f2e08d11 100755
--- a/bin/scintillation_utils.py
+++ b/bin/scintillation_utils.py
@@ -1,4 +1,4 @@
-#!/home/mevius/bin/python3.8
+#!/usr/bin/python3
 from argparse import ArgumentParser
 import os
 import logging
diff --git a/scintillation/averaging.py b/scintillation/averaging.py
index 128df0ade377c271a83cdcfe5568cfabf08e6b51..247396d4becb8a1474dd38dc902e4fefe8462e7a 100644
--- a/scintillation/averaging.py
+++ b/scintillation/averaging.py
@@ -109,6 +109,8 @@ class SmartJsonEncoder(json.JSONEncoder):
         try:
             if isinstance(o, numpy.int32):
                 return int(o)
+            elif isinstance(o, numpy.int64):
+                return int(o)
             elif isinstance(o, numpy.ndarray):
                 return o.tolist()
             elif isinstance(o, numpy.uint64):
@@ -174,6 +176,8 @@ def extract_root_metadata(dataset):
     if not 'TARGET' in list(metadata.keys()):
         if 'TARGETS' in list(metadata.keys()):
             metadata['TARGET']=metadata['TARGETS'][-1].split("_")[0]
+    if type(metadata['TARGET']) == list:
+        metadata['TARGET']=metadata['TARGET'][-1].split("_")[0]
     return metadata
 
 
@@ -284,7 +288,6 @@ def extract_metadata(dataset):
         else:
             continue
         metadata_per_dynspec[dynspec].update(root_metadata)
-
     return metadata_per_dynspec
 
 
@@ -698,10 +701,13 @@ def split_samples(dynspec_name,
 
     :return:
     """
-    if isinstance(metadata['TIME']['INCREMENT'], list):
-        time_delta, *_ = metadata['TIME']['INCREMENT']
+    if 'INCREMENT' in metadata['TIME'].keys():
+        if isinstance(metadata['TIME']['INCREMENT'], list):
+            time_delta, *_ = metadata['TIME']['INCREMENT']
+        else:
+            time_delta = metadata['TIME']['INCREMENT']
     else:
-        time_delta = metadata['TIME']['INCREMENT']
+        time_delta = metadata['SAMPLING_TIME']
 
     if 'DYNSPEC_START_UTC' in metadata:
         obs_start_time = parse_datetime_str(metadata['DYNSPEC_START_UTC'])