Fix breadcrumbs a bit (not fully!)