Fix last 20 orphans