Orphan path checking improvements