diff --git a/flatland/envs/persistence.py b/flatland/envs/persistence.py
index b8354078f68705e2d3757a61626c03df2ac9dc4c..41f352e70017f1f37bb66abaa911d25725618836 100644
--- a/flatland/envs/persistence.py
+++ b/flatland/envs/persistence.py
@@ -163,7 +163,7 @@ class RailEnvPersister(object):
             # remove the legacy key
             del env_dict["agents_static"]
         elif "agents" in env_dict:
-            env_dict["agents"] = [EnvAgent(*d[0:12]) for d in env_dict["agents"]]
+            env_dict["agents"] = [EnvAgent(*d[0:len(d)]) for d in env_dict["agents"]]
 
         return env_dict
 
diff --git a/flatland/evaluators/service.py b/flatland/evaluators/service.py
index 81fa6705f7c076eb72a1e2e02b3517f044408933..305ee166f51b12b5cc836ea02241f1e63549f0aa 100644
--- a/flatland/evaluators/service.py
+++ b/flatland/evaluators/service.py
@@ -10,6 +10,7 @@ import traceback
 import json
 import itertools
 import re
+import logging
 
 import crowdai_api
 import msgpack
@@ -130,7 +131,7 @@ class FlatlandRemoteEvaluationService:
         shuffle=False,
         missing_only=False,
         result_output_path=None,
-        disable_timeouts=True
+        disable_timeouts=False
     ):
 
         # Episode recording properties
@@ -725,6 +726,7 @@ class FlatlandRemoteEvaluationService:
             del self.env
 
             self.env, _env_dict = RailEnvPersister.load_new(test_env_file_path)
+            # distance map here?
 
             self.begin_simulation = time.time()