diff --git a/enrollments-events/app/events/enroll.py b/enrollments-events/app/events/enroll.py
index 7e58da7..fd1cc27 100644
--- a/enrollments-events/app/events/enroll.py
+++ b/enrollments-events/app/events/enroll.py
@@ -65,7 +65,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> list[str]
             deduplication_window=DeduplicationWindow(offset_days=90),
             linked_entities=frozenset({LinkedEntity(order_id, 'ORDER')}),
         )
-        ids.append(enrollment.id)
+        ids.append(str(enrollment.id))
 
     order_layer.update_item(
         key=KeyPair(new_image['id'], new_image['sk']),
diff --git a/enrollments-events/app/events/stopgap/patch_enroll.py b/enrollments-events/app/events/stopgap/patch_enroll.py
index 5e5c5fd..78c6a22 100644
--- a/enrollments-events/app/events/stopgap/patch_enroll.py
+++ b/enrollments-events/app/events/stopgap/patch_enroll.py
@@ -62,7 +62,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
 
 class CourseNotFoundError(Exception):
     def __init__(self, *args):
-        super().__init__('Course not found')
+        super().__init__('Course not found in SQLite')
 
 
 def _get_course(course_id: str) -> dict:
diff --git a/enrollments-events/app/fonts/SF-Pro.ttf b/enrollments-events/app/fonts/SF-Pro.ttf
deleted file mode 100755
index 1e8aa63..0000000
Binary files a/enrollments-events/app/fonts/SF-Pro.ttf and /dev/null differ
diff --git a/order-events/app/events/remove_slots_if_canceled.py b/order-events/app/events/remove_slots_if_canceled.py
index 7e5e0b5..0fea1af 100644
--- a/order-events/app/events/remove_slots_if_canceled.py
+++ b/order-events/app/events/remove_slots_if_canceled.py
@@ -30,10 +30,11 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
             # f'SLOT#ORG#{org_id}',
             f'vacancies#{org_id}',
             order_id,
-        )
+        ),
+        limit=100,
     )
 
-    logger.info('Slots found', slots=result['items'])
+    logger.info('Slots found', total_items=len(result['items']), slots=result['items'])
 
     with enrollment_layer.batch_writer() as batch:
         for pair in result['items']:
diff --git a/order-events/app/events/stopgap/remove_slots.py b/order-events/app/events/stopgap/remove_slots.py
index 3109e53..dd21fa5 100644
--- a/order-events/app/events/stopgap/remove_slots.py
+++ b/order-events/app/events/stopgap/remove_slots.py
@@ -5,7 +5,6 @@ from aws_lambda_powertools.utilities.data_classes import (
 )
 from aws_lambda_powertools.utilities.typing import LambdaContext
 from layercake.dynamodb import (
-    ComposeKey,
     DynamoDBPersistenceLayer,
     KeyPair,
 )
@@ -26,10 +25,10 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
     the total is greater than zero."""
     new_image = event.detail['new_image']
     data = order_layer.get_item(KeyPair(new_image['id'], '0'))
-    tenant_id = data['tenant_id']
+    org_id = data['tenant_id']
 
     policy = user_layer.collection.get_item(
-        KeyPair(pk=tenant_id, sk='metadata#billing_policy'),
+        KeyPair(pk=org_id, sk='metadata#billing_policy'),
         raise_on_error=False,
         default=False,
     )
@@ -39,22 +38,28 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
         logger.info('Missing billing policy.')
         return False
 
-    logger.info(f'Billing policy from Tenant ID "{tenant_id}" found', policy=policy)
+    logger.info(f'Billing policy from Org ID "{org_id}" found', policy=policy)
 
     result = enrollment_layer.collection.query(
         KeyPair(
-            ComposeKey(tenant_id, prefix='vacancies'),
+            f'vacancies#{org_id}',
             new_image['id'],
-        )
+        ),
+        limit=100,
     )
 
-    logger.info('Slots found', slots=result['items'])
+    logger.info(
+        'Slots found',
+        total_items=len(result['items']),
+        slots=result['items'],
+    )
 
     with enrollment_layer.batch_writer() as batch:
         for pair in result['items']:
+            org_id = pair['id']
             batch.delete_item(
                 Key={
-                    'id': {'S': ComposeKey(pair['id'], prefix='vacancies')},
+                    'id': {'S': f'vacancies#{org_id}'},
                     'sk': {'S': pair['sk']},
                 }
             )