Fixes for breadcrumbs

Fixes #152