diff --git a/.vscode/launch.json b/.vscode/launch.json
index cb110ca006ac0b095325085aa491bda99768138f..ac6484591087f39caa3c982401753688ebdd159f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "name": "API Server (Development)",
             "type": "python",
             "request": "launch",
-            "program": "${workspaceFolder}/src/server.py",
+            "program": "${workspaceFolder}/src/app.py",
             "console": "integratedTerminal"
         }
     ]
diff --git a/src/rest/controllers/public_controller.py b/src/rest/controllers/public_controller.py
index 27a8b0243b2b2bda91523d5d83ef1017b29d1031..de4c94f95ac453a31526d19de368298cd8aef65a 100644
--- a/src/rest/controllers/public_controller.py
+++ b/src/rest/controllers/public_controller.py
@@ -32,4 +32,4 @@ def list_tracks(page=None, limit=None):  # noqa: E501
     :rtype: List[PlayLogEntry]
     """
     service = current_app.config['SERVICE']
-    return service.list_tracks(offset, limit)
+    return service.list_tracks(page, limit)
diff --git a/src/rest/models/__init__.py b/src/rest/models/__init__.py
index ba5bd0eba044f0271f53f5fe414fb16a60a1b4e3..379af5f5ead8d928e88a98db4519011efd56b764 100644
--- a/src/rest/models/__init__.py
+++ b/src/rest/models/__init__.py
@@ -7,5 +7,5 @@ from src.rest.models.clock_info import ClockInfo
 from src.rest.models.health_info import HealthInfo
 from src.rest.models.play_log_entry import PlayLogEntry
 from src.rest.models.playlist_entry import PlaylistEntry
-from src.rest.models.schedule import Schedule
+from src.rest.models.timeslot import Timeslot
 from src.rest.models.status_entry import StatusEntry
diff --git a/src/rest/swagger/swagger.yaml b/src/rest/swagger/swagger.yaml
index 3095fce62c6c03619332a09637613cdd73216dfe..656651d656f268bb2dbba402515640a732d8d4e2 100644
--- a/src/rest/swagger/swagger.yaml
+++ b/src/rest/swagger/swagger.yaml
@@ -147,7 +147,7 @@ paths:
         style: simple
         explode: false
         schema:
-          type: date-time
+          type: string
       - name: page
         in: query
         description: The number of items to skip before starting to collect the result
@@ -398,7 +398,7 @@ components:
         log_time: 2020-08-29T09:12:33.001Z
     ClockInfo:
       required:
-      - current_schedule
+      - current_timeslot
       type: object
       properties:
         current_track: