MAL-54 | Fix breadcrumbs and fix scheduler