Fixes around breadcrumbs