Some breadcrumb fixes