Fix broken lookup paths