Fix not-found errors