Breadcrumb fixes